diff --git a/src/web-ui/src/app/components/AboutDialog/AboutDialog.scss b/src/web-ui/src/app/components/AboutDialog/AboutDialog.scss
index b3713c31..bdbb590d 100644
--- a/src/web-ui/src/app/components/AboutDialog/AboutDialog.scss
+++ b/src/web-ui/src/app/components/AboutDialog/AboutDialog.scss
@@ -26,40 +26,6 @@
   text-align: center;
   position: relative;
   overflow: hidden;
-  
-  // Background glow effect
-  &::before {
-    content: '';
-    position: absolute;
-    top: -60%;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 300px;
-    height: 200px;
-    background: radial-gradient(ellipse, rgba(139, 92, 246, 0.1) 0%, transparent 70%);
-    filter: blur(40px);
-    pointer-events: none;
-    animation: about-glow-float 12s ease-in-out infinite;
-  }
-
-  &::after {
-    content: '';
-    position: absolute;
-    top: 20%;
-    right: 5%;
-    width: 100px;
-    height: 100px;
-    background: radial-gradient(circle, rgba(59, 130, 246, 0.06) 0%, transparent 70%);
-    filter: blur(25px);
-    pointer-events: none;
-    animation: about-glow-float 10s ease-in-out infinite reverse;
-  }
-}
-
-@keyframes about-glow-float {
-  0%, 100% { transform: translateX(-50%) translate(0, 0) scale(1); }
-  33% { transform: translateX(-50%) translate(15px, -10px) scale(1.03); }
-  66% { transform: translateX(-50%) translate(-10px, 8px) scale(0.98); }
 }
 
 .bitfun-about-dialog__title {
@@ -69,7 +35,6 @@
   margin: 0 0 10px 0;
   letter-spacing: -0.03em;
   color: var(--color-text-primary);
-  text-shadow: 0 0 40px rgba(100, 180, 255, 0.2);
   position: relative;
   z-index: 1;
   animation: about-title-enter 0.5s ease-out 0.1s both;
@@ -115,7 +80,7 @@
 .bitfun-about-dialog__divider {
   width: 60px;
   height: 1px;
-  background: linear-gradient(90deg, transparent 0%, rgba(139, 92, 246, 0.25) 50%, transparent 100%);
+  background: var(--border-subtle);
   margin-top: 18px;
   position: relative;
   z-index: 1;
@@ -145,13 +110,9 @@
   span {
     width: 3px;
     height: 3px;
-    background: linear-gradient(135deg, #8B5CF6, #3B82F6);
+    background: var(--color-text-muted);
     border-radius: 50%;
-    opacity: 0.35;
-    animation: about-dot-pulse 2.5s ease-in-out infinite;
-
-    &:nth-child(2) { animation-delay: 0.25s; }
-    &:nth-child(3) { animation-delay: 0.5s; }
+    opacity: 0.45;
   }
 }
 
@@ -160,11 +121,6 @@
   to { opacity: 1; }
 }
 
-@keyframes about-dot-pulse {
-  0%, 100% { opacity: 0.25; transform: scale(1); }
-  50% { opacity: 0.6; transform: scale(1.3); }
-}
-
 // ==================== Scrollable area ====================
 
 .bitfun-about-dialog__scrollable {
diff --git a/src/web-ui/src/app/components/GalleryLayout/GalleryDetailModal.scss b/src/web-ui/src/app/components/GalleryLayout/GalleryDetailModal.scss
index 71354664..38dd17ff 100644
--- a/src/web-ui/src/app/components/GalleryLayout/GalleryDetailModal.scss
+++ b/src/web-ui/src/app/components/GalleryLayout/GalleryDetailModal.scss
@@ -15,8 +15,6 @@
 
   // Small decorative gradient behind icon
   &__icon {
-    --gallery-detail-gradient: linear-gradient(135deg, rgba(59,130,246,0.28) 0%, rgba(139,92,246,0.18) 100%);
-
     width: 56px;
     height: 56px;
     border-radius: $size-radius-lg;
@@ -25,25 +23,9 @@
     justify-content: center;
     flex-shrink: 0;
     color: var(--color-text-primary);
-    background: var(--gallery-detail-gradient);
-    border: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--element-bg-soft);
+    border: 1px solid var(--border-subtle);
     position: relative;
-
-    // Blurred glow behind icon
-    &::before {
-      content: "";
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      width: 80px;
-      height: 80px;
-      border-radius: 50%;
-      background: var(--gallery-detail-gradient);
-      filter: blur(20px);
-      z-index: -1;
-      opacity: 0.6;
-    }
   }
 
   &__summary {
diff --git a/src/web-ui/src/app/components/NavPanel/MainNav.tsx b/src/web-ui/src/app/components/NavPanel/MainNav.tsx
index d0dca917..161ae0b1 100644
--- a/src/web-ui/src/app/components/NavPanel/MainNav.tsx
+++ b/src/web-ui/src/app/components/NavPanel/MainNav.tsx
@@ -35,14 +35,12 @@ import { useMiniAppCatalogSync } from '../../scenes/miniapps/hooks/useMiniAppCat
 import { flowChatStore } from '@/flow_chat/store/FlowChatStore';
 import { compareSessionsForDisplay } from '@/flow_chat/utils/sessionOrdering';
 import { flowChatManager } from '@/flow_chat/services/FlowChatManager';
-import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import { workspaceManager } from '@/infrastructure/services/business/workspaceManager';
 import { useWorkspaceContext } from '@/infrastructure/contexts/WorkspaceContext';
 import { createLogger } from '@/shared/utils/logger';
 import { WorkspaceKind } from '@/shared/types';
 import { useSSHRemoteContext, SSHConnectionDialog, RemoteFileBrowser } from '@/features/ssh-remote';
 
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
 const NAV_DISPLAY_MODE_STORAGE_KEY = 'bitfun.nav.displayMode';
 import './NavPanel.scss';
 
@@ -272,7 +270,6 @@ const MainNav: React.FC<MainNavProps> = ({
     return workspaceSessions[0]?.sessionId;
   }, [resolvedAssistantWorkspace]);
 
-  const [defaultSessionMode, setDefaultSessionMode] = useState<'code' | 'cowork'>('code');
   const [navDisplayMode, setNavDisplayMode] = useState<NavDisplayMode>(getInitialNavDisplayMode);
   const [isModeSwitching, setIsModeSwitching] = useState(false);
   const [modeLogoSrc, setModeLogoSrc] = useState('/panda_1.png');
@@ -281,25 +278,6 @@ const MainNav: React.FC<MainNavProps> = ({
   const modeSwitchTimerRef = useRef<number | null>(null);
   const modeSwitchSwapTimerRef = useRef<number | null>(null);
 
-  useEffect(() => {
-    configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-      if (mode === 'code' || mode === 'cowork') {
-        setDefaultSessionMode(mode);
-        setSessionMode(mode);
-      }
-    }).catch(() => {});
-
-    const unwatch = configManager.watch(DEFAULT_MODE_CONFIG_KEY, () => {
-      configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-        if (mode === 'code' || mode === 'cowork') {
-          setDefaultSessionMode(mode);
-          setSessionMode(mode);
-        }
-      }).catch(() => {});
-    });
-    return () => unwatch();
-  }, [setSessionMode]);
-
   useEffect(() => () => {
     if (modeSwitchTimerRef.current !== null) {
       window.clearTimeout(modeSwitchTimerRef.current);
@@ -346,18 +324,12 @@ const MainNav: React.FC<MainNavProps> = ({
     try {
       await flowChatManager.createChatSession(
         {},
-        mode ?? (
-          isAssistantWorkspaceActive
-          ? 'Claw'
-          : defaultSessionMode === 'cowork'
-            ? 'Cowork'
-            : 'agentic'
-        )
+        mode ?? (isAssistantWorkspaceActive ? 'Claw' : 'agentic')
       );
     } catch (err) {
       log.error('Failed to create session', err);
     }
-  }, [openScene, switchLeftPanelTab, defaultSessionMode, isAssistantWorkspaceActive]);
+  }, [openScene, switchLeftPanelTab, isAssistantWorkspaceActive]);
 
   const handleCreateCodeSession = useCallback(() => {
     setSessionMode('code');
@@ -897,9 +869,7 @@ const MainNav: React.FC<MainNavProps> = ({
                               tab === 'sessions'
                                 ? isAssistantWorkspaceActive
                                   ? t('nav.sessions.newClawSession')
-                                  : defaultSessionMode === 'cowork'
-                                    ? t('nav.sessions.newCoworkSession')
-                                    : t('nav.sessions.newCodeSession')
+                                  : t('nav.sessions.newCodeSession')
                                 : undefined
                             }
                             onActionClick={tab === 'sessions' ? handleCreateSession : undefined}
diff --git a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.scss b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.scss
index 1aa4f0f9..e7140a05 100644
--- a/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.scss
+++ b/src/web-ui/src/app/components/NewProjectDialog/NewProjectDialog.scss
@@ -21,26 +21,6 @@
     text-align: center;
     position: relative;
     overflow: hidden;
-    
-    // Background glow effect
-    &::before {
-      content: '';
-      position: absolute;
-      top: -80%;
-      left: 50%;
-      transform: translateX(-50%);
-      width: 250px;
-      height: 150px;
-      background: radial-gradient(ellipse, rgba(34, 197, 94, 0.08) 0%, transparent 70%);
-      filter: blur(30px);
-      pointer-events: none;
-      animation: new-project-glow 10s ease-in-out infinite;
-    }
-  }
-
-  @keyframes new-project-glow {
-    0%, 100% { transform: translateX(-50%) scale(1); opacity: 0.8; }
-    50% { transform: translateX(-50%) scale(1.1); opacity: 1; }
   }
 
   &__icon-wrapper {
diff --git a/src/web-ui/src/app/components/SceneBar/SceneBar.tsx b/src/web-ui/src/app/components/SceneBar/SceneBar.tsx
index 9e7a79a4..174f3210 100644
--- a/src/web-ui/src/app/components/SceneBar/SceneBar.tsx
+++ b/src/web-ui/src/app/components/SceneBar/SceneBar.tsx
@@ -5,7 +5,7 @@
  * AI Agent tab shows the current session title as a subtitle.
  */
 
-import React, { useCallback, useRef, useState, useEffect } from 'react';
+import React, { useCallback, useRef } from 'react';
 import SceneTab from './SceneTab';
 import { WindowControls } from '@/component-library';
 import { useSceneManager } from '../../hooks/useSceneManager';
@@ -13,12 +13,9 @@ import { useCurrentSessionTitle } from '../../hooks/useCurrentSessionTitle';
 import { useCurrentSettingsTabTitle } from '../../hooks/useCurrentSettingsTabTitle';
 import { useI18n } from '@/infrastructure/i18n/hooks/useI18n';
 import { flowChatManager } from '@/flow_chat/services/FlowChatManager';
-import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import { createLogger } from '@/shared/utils/logger';
 import './SceneBar.scss';
 
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
-
 const log = createLogger('SceneBar');
 
 const INTERACTIVE_SELECTOR =
@@ -43,20 +40,6 @@ const SceneBar: React.FC<SceneBarProps> = ({
   const sessionTitle = useCurrentSessionTitle();
   const settingsTabTitle = useCurrentSettingsTabTitle();
   const { t } = useI18n('common');
-  const [defaultMode, setDefaultMode] = useState<'code' | 'cowork'>('code');
-
-  useEffect(() => {
-    configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-      if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-    }).catch(() => {});
-    const unwatch = configManager.watch(DEFAULT_MODE_CONFIG_KEY, () => {
-      configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-        if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-      }).catch(() => {});
-    });
-    return () => unwatch();
-  }, []);
-
   const hasWindowControls = !!(onMinimize && onMaximize && onClose);
   const sceneBarClassName = `bitfun-scene-bar ${!hasWindowControls ? 'bitfun-scene-bar--no-controls' : ''} ${className}`.trim();
   const isSingleTab = openTabs.length <= 1;
@@ -122,7 +105,7 @@ const SceneBar: React.FC<SceneBarProps> = ({
           const subtitle =
             (tab.id === 'session' && sessionTitle ? sessionTitle : undefined)
             ?? (tab.id === 'settings' && settingsTabTitle ? settingsTabTitle : undefined);
-          const actionTitle = tab.id === 'session' ? (defaultMode === 'cowork' ? t('nav.sessions.newCoworkSession') : t('nav.sessions.newCodeSession')) : undefined;
+          const actionTitle = tab.id === 'session' ? t('nav.sessions.newCodeSession') : undefined;
           return (
             <SceneTab
               key={tab.id}
diff --git a/src/web-ui/src/app/layout/AppLayout.tsx b/src/web-ui/src/app/layout/AppLayout.tsx
index 94a41d39..5b28c7b7 100644
--- a/src/web-ui/src/app/layout/AppLayout.tsx
+++ b/src/web-ui/src/app/layout/AppLayout.tsx
@@ -25,7 +25,6 @@ import { NewProjectDialog } from '../components/NewProjectDialog';
 import { AboutDialog } from '../components/AboutDialog';
 import { WorkspaceManager } from '../../tools/workspace';
 import { workspaceAPI } from '@/infrastructure/api';
-import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import { createLogger } from '@/shared/utils/logger';
 import { useI18n } from '@/infrastructure/i18n';
 import { WorkspaceKind } from '@/shared/types';
@@ -33,24 +32,11 @@ import { shortcutManager } from '@/infrastructure/services/ShortcutManager';
 import './AppLayout.scss';
 
 const log = createLogger('AppLayout');
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
 
 interface AppLayoutProps {
   className?: string;
 }
 
-type DefaultSessionMode = 'code' | 'cowork';
-
-async function resolveDefaultSessionAgentType(): Promise<'agentic' | 'Cowork'> {
-  try {
-    const defaultMode = await configManager.getConfig<DefaultSessionMode>(DEFAULT_MODE_CONFIG_KEY);
-    return defaultMode === 'cowork' ? 'Cowork' : 'agentic';
-  } catch (error) {
-    log.warn('Failed to load default session mode, falling back to code', error);
-    return 'agentic';
-  }
-}
-
 const AppLayout: React.FC<AppLayoutProps> = ({ className = '' }) => {
   const { t } = useI18n('components');
   const { currentWorkspace, hasWorkspace, openWorkspace, recentWorkspaces, loading } = useWorkspaceContext();
@@ -201,7 +187,7 @@ const AppLayout: React.FC<AppLayoutProps> = ({ className = '' }) => {
           const initialSessionMode =
             currentWorkspace.workspaceKind === WorkspaceKind.Assistant
               ? 'Claw'
-              : explicitPreferredMode || await resolveDefaultSessionAgentType();
+              : explicitPreferredMode || 'agentic';
           sessionId = await flowChatManager.createChatSession({}, initialSessionMode);
         }
 
diff --git a/src/web-ui/src/app/scenes/settings/SettingsNav.scss b/src/web-ui/src/app/scenes/settings/SettingsNav.scss
index 35fb8bad..624cfc29 100644
--- a/src/web-ui/src/app/scenes/settings/SettingsNav.scss
+++ b/src/web-ui/src/app/scenes/settings/SettingsNav.scss
@@ -32,6 +32,128 @@
     text-overflow: ellipsis;
   }
 
+  // ── Search ───────────────────────────────────────────────
+
+  &__search {
+    flex-shrink: 0;
+    padding: 0 $size-gap-3 $size-gap-2;
+  }
+
+  /** Component-library `Search` — align with nav tokens + subtle focus scale */
+  &__search-field.search {
+    width: 100%;
+
+    .search__wrapper {
+      border-color: var(--border-subtle);
+      background: var(--element-bg-soft);
+      border-radius: $size-radius-base;
+      transition: border-color $motion-fast $easing-standard,
+                  box-shadow $motion-fast $easing-standard,
+                  transform $motion-fast $easing-standard;
+    }
+
+    &.search--focused:not(.search--disabled) .search__wrapper {
+      border-color: var(--color-primary);
+      box-shadow: 0 0 0 1px color-mix(in srgb, var(--color-primary) 35%, transparent);
+      transform: scale(1.01);
+    }
+
+    &.search--focused:not(.search--disabled) .search__prefix .search__icon {
+      color: var(--color-primary);
+    }
+  }
+
+  &__search-results {
+    display: flex;
+    flex-direction: column;
+    padding: 2px $size-gap-2;
+    gap: 2px;
+  }
+
+  &__search-result-item {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 2px;
+    min-height: auto;
+    padding: $size-gap-2 $size-gap-2 $size-gap-2 $size-gap-3;
+    border: none;
+    border-radius: $size-radius-base;
+    background: transparent;
+    color: var(--color-text-secondary);
+    cursor: pointer;
+    text-align: left;
+    font-size: $font-size-sm;
+    font-weight: 400;
+    width: 100%;
+    position: relative;
+    transition: color $motion-fast $easing-standard,
+                background $motion-fast $easing-standard;
+
+    &:hover {
+      color: var(--color-text-primary);
+      background: var(--element-bg-soft);
+    }
+
+    &.is-highlighted {
+      color: var(--color-text-primary);
+      background: var(--element-bg-soft);
+    }
+
+    &.is-active {
+      color: var(--color-text-primary);
+      background: color-mix(in srgb, var(--color-primary) 10%, transparent);
+      font-weight: 500;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 2px;
+        height: 16px;
+        background: var(--color-primary);
+        border-radius: 0 2px 2px 0;
+      }
+    }
+
+    &:focus-visible {
+      outline: 2px solid var(--color-accent-500);
+      outline-offset: -1px;
+    }
+  }
+
+  &__search-result-line {
+    width: 100%;
+    line-height: 1.35;
+    font-weight: 500;
+  }
+
+  &__search-result-desc {
+    width: 100%;
+    font-size: 11px;
+    line-height: 1.35;
+    color: var(--color-text-muted);
+    font-weight: 400;
+  }
+
+  &__search-empty {
+    padding: $size-gap-3 $size-gap-3;
+    font-size: $font-size-sm;
+    color: var(--color-text-muted);
+    text-align: center;
+  }
+
+  &__search-highlight {
+    padding: 0;
+    margin: 0;
+    background: color-mix(in srgb, var(--color-primary) 28%, transparent);
+    color: inherit;
+    font-weight: inherit;
+    border-radius: 2px;
+  }
+
   // ── Scrollable sections ────────────────────────────────
 
   &__sections {
@@ -135,5 +257,12 @@
 @media (prefers-reduced-motion: reduce) {
   .bitfun-settings-nav {
     &__item { transition: none; }
+    &__search-field.search .search__wrapper {
+      transition: none;
+    }
+    &__search-field.search.search--focused:not(.search--disabled) .search__wrapper {
+      transform: none;
+    }
+    &__search-result-item { transition: none; }
   }
 }
diff --git a/src/web-ui/src/app/scenes/settings/SettingsNav.tsx b/src/web-ui/src/app/scenes/settings/SettingsNav.tsx
index e77e5285..1f798457 100644
--- a/src/web-ui/src/app/scenes/settings/SettingsNav.tsx
+++ b/src/web-ui/src/app/scenes/settings/SettingsNav.tsx
@@ -3,69 +3,386 @@
  *
  * Layout:
  *   ┌──────────────────────┐
- *   │ ← Settings           │  header: back button + title
+ *   │  Settings            │  header: title
  *   ├──────────────────────┤
- *   │  Category            │
- *   │    › Tab item        │  scrollable nav list
- *   │    › Tab item        │
- *   │  ...                 │
+ *   │  Search…             │  filter config tabs
+ *   ├──────────────────────┤
+ *   │  Category / results  │
  *   └──────────────────────┘
- *
- * Clicking "back" closes the Settings scene (sceneStore.closeScene) which
- * automatically restores the previously-active scene and its nav.
  */
 
-import React, { useCallback } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import type { i18n as I18nApi } from 'i18next';
 import { useTranslation } from 'react-i18next';
+import { Search } from '@/component-library';
 import { useSettingsStore } from './settingsStore';
 import { SETTINGS_CATEGORIES } from './settingsConfig';
 import type { ConfigTab } from './settingsConfig';
+import { SETTINGS_TAB_SEARCH_CONTENT } from './settingsTabSearchContent';
 import './SettingsNav.scss';
 
-const SettingsNav: React.FC = () => {
-  const { t } = useTranslation('settings');
-  const { activeTab, setActiveTab } = useSettingsStore();
+const SEARCH_DEBOUNCE_MS = 150;
+
+export interface SettingsSearchRow {
+  tabId: ConfigTab;
+  categoryId: string;
+  categoryLabel: string;
+  tabLabel: string;
+  description: string;
+  haystack: string;
+}
+
+function resolveTabPageContentHaystack(i18n: I18nApi, tabId: ConfigTab): string {
+  const phrases = SETTINGS_TAB_SEARCH_CONTENT[tabId];
+  if (!phrases?.length) return '';
+  const lang = i18n.language;
+  const parts: string[] = [];
+  for (const { ns, key } of phrases) {
+    const tNs = i18n.getFixedT(lang, ns);
+    const text = tNs(key, { defaultValue: '' });
+    if (typeof text === 'string' && text.trim()) {
+      parts.push(text);
+    }
+  }
+  return parts.join(' ');
+}
+
+function buildSettingsSearchIndex(
+  t: (key: string, options?: Record<string, unknown>) => string,
+  i18n: I18nApi
+): SettingsSearchRow[] {
+  const rows: SettingsSearchRow[] = [];
+  for (const cat of SETTINGS_CATEGORIES) {
+    const categoryLabel = t(cat.nameKey, { defaultValue: cat.id });
+    for (const tabDef of cat.tabs) {
+      const tabLabel = t(tabDef.labelKey, { defaultValue: tabDef.id });
+      const description = tabDef.descriptionKey
+        ? t(tabDef.descriptionKey, { defaultValue: '' })
+        : '';
+      const kw = (tabDef.keywords ?? []).join(' ');
+      const pageContent = resolveTabPageContentHaystack(i18n, tabDef.id);
+      const haystack = [categoryLabel, tabLabel, description, kw, tabDef.id, pageContent]
+        .join(' ')
+        .toLowerCase();
+      rows.push({
+        tabId: tabDef.id,
+        categoryId: cat.id,
+        categoryLabel,
+        tabLabel,
+        description,
+        haystack,
+      });
+    }
+  }
+  return rows;
+}
+
+function useSettingsSearch(
+  t: (key: string, options?: Record<string, unknown>) => string,
+  i18n: I18nApi,
+  debouncedQuery: string
+): SettingsSearchRow[] {
+  const index = useMemo(
+    () => buildSettingsSearchIndex(t, i18n),
+    [t, i18n, i18n.language]
+  );
+
+  return useMemo(() => {
+    const q = debouncedQuery.trim().toLowerCase();
+    if (!q) return [];
+    return index.filter((row) => row.haystack.includes(q));
+  }, [index, debouncedQuery]);
+}
+
+function highlightFirstMatch(text: string, query: string): React.ReactNode {
+  const q = query.trim();
+  if (!q) return text;
+  const lower = text.toLowerCase();
+  const qi = q.toLowerCase();
+  const idx = lower.indexOf(qi);
+  if (idx < 0) return text;
+  return (
+    <>
+      {text.slice(0, idx)}
+      <mark className="bitfun-settings-nav__search-highlight">
+        {text.slice(idx, idx + qi.length)}
+      </mark>
+      {text.slice(idx + qi.length)}
+    </>
+  );
+}
+
+function useSettingsNav() {
+  const { t, i18n } = useTranslation('settings');
+  const activeTab = useSettingsStore((s) => s.activeTab);
+  const setActiveTab = useSettingsStore((s) => s.setActiveTab);
+  const searchQuery = useSettingsStore((s) => s.searchQuery);
+  const setSearchQuery = useSettingsStore((s) => s.setSearchQuery);
+
+  const [draftQuery, setDraftQuery] = useState('');
+  const searchInputRef = useRef<HTMLInputElement>(null);
+  const [highlightedIndex, setHighlightedIndex] = useState(-1);
+  const resultsRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const id = window.setTimeout(() => {
+      setSearchQuery(draftQuery);
+    }, SEARCH_DEBOUNCE_MS);
+    return () => window.clearTimeout(id);
+  }, [draftQuery, setSearchQuery]);
+
+  const results = useSettingsSearch(t, i18n, searchQuery);
+  const isSearchMode = draftQuery.trim().length > 0;
+
+  useEffect(() => {
+    setHighlightedIndex((prev) => {
+      if (results.length === 0) return -1;
+      if (prev >= results.length) return results.length - 1;
+      return prev;
+    });
+  }, [results.length]);
 
-  const handleTabClick = useCallback((tab: ConfigTab) => {
-    setActiveTab(tab);
-  }, [setActiveTab]);
+  /** Sync store / highlight when library Search clears via button or Escape (after onChange). */
+  const handleSearchComponentClear = useCallback(() => {
+    setSearchQuery('');
+    setHighlightedIndex(-1);
+  }, [setSearchQuery]);
+
+  const clearSearch = useCallback(() => {
+    setDraftQuery('');
+    setSearchQuery('');
+    setHighlightedIndex(-1);
+    searchInputRef.current?.focus();
+  }, [setSearchQuery]);
+
+  const activateTab = useCallback(
+    (tab: ConfigTab) => {
+      setActiveTab(tab);
+      clearSearch();
+    },
+    [setActiveTab, clearSearch]
+  );
+
+  const handleTabClick = useCallback(
+    (tab: ConfigTab) => {
+      setActiveTab(tab);
+    },
+    [setActiveTab]
+  );
+
+  const handleSearchKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === 'Escape') {
+        e.preventDefault();
+        clearSearch();
+        return;
+      }
+      if (e.key === 'ArrowDown' && results.length > 0) {
+        e.preventDefault();
+        setHighlightedIndex(0);
+        queueMicrotask(() => resultsRef.current?.focus());
+        return;
+      }
+      if (e.key === 'Enter' && results.length === 1) {
+        e.preventDefault();
+        activateTab(results[0].tabId);
+      }
+    },
+    [clearSearch, results, activateTab, resultsRef]
+  );
+
+  const handleResultsKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLDivElement>) => {
+      if (!isSearchMode || results.length === 0) return;
+
+      if (e.key === 'Escape') {
+        e.preventDefault();
+        clearSearch();
+        return;
+      }
+      if (e.key === 'ArrowDown') {
+        e.preventDefault();
+        setHighlightedIndex((i) => Math.min(i + 1, results.length - 1));
+        return;
+      }
+      if (e.key === 'ArrowUp') {
+        e.preventDefault();
+        setHighlightedIndex((i) => {
+          if (i <= 0) {
+            searchInputRef.current?.focus();
+            return -1;
+          }
+          return i - 1;
+        });
+        return;
+      }
+      if (e.key === 'Enter' && highlightedIndex >= 0 && highlightedIndex < results.length) {
+        e.preventDefault();
+        activateTab(results[highlightedIndex].tabId);
+      }
+    },
+    [isSearchMode, results, highlightedIndex, activateTab, clearSearch]
+  );
+
+  const displayQuery = searchQuery.trim();
+
+  return {
+    t,
+    activeTab,
+    handleTabClick,
+    draftQuery,
+    setDraftQuery,
+    searchInputRef,
+    resultsRef,
+    results,
+    isSearchMode,
+    displayQuery,
+    highlightedIndex,
+    setHighlightedIndex,
+    handleSearchComponentClear,
+    activateTab,
+    handleSearchKeyDown,
+    handleResultsKeyDown,
+  };
+}
+
+const SettingsNav: React.FC = () => {
+  const {
+    t,
+    activeTab,
+    handleTabClick,
+    draftQuery,
+    setDraftQuery,
+    searchInputRef,
+    resultsRef,
+    results,
+    isSearchMode,
+    displayQuery,
+    highlightedIndex,
+    setHighlightedIndex,
+    handleSearchComponentClear,
+    activateTab,
+    handleSearchKeyDown,
+    handleResultsKeyDown,
+  } = useSettingsNav();
 
   return (
     <div className="bitfun-settings-nav">
-      {/* Header: title only — back/forward handled by NavBar */}
       <div className="bitfun-settings-nav__header">
         <span className="bitfun-settings-nav__title">
-          {t('configCenter.title', 'Settings')}
+          {t('configCenter.title', { defaultValue: t('title', { defaultValue: 'Settings' }) })}
         </span>
       </div>
 
-      {/* Scrollable category + tab list */}
-      <div className="bitfun-settings-nav__sections">
-        {SETTINGS_CATEGORIES.map(category => (
-          <div key={category.id} className="bitfun-settings-nav__category">
-            <div className="bitfun-settings-nav__category-header">
-              <span className="bitfun-settings-nav__category-label">
-                {t(category.nameKey, category.id)}
-              </span>
-            </div>
+      <div className="bitfun-settings-nav__search">
+        <Search
+          ref={searchInputRef}
+          className="bitfun-settings-nav__search-field"
+          size="small"
+          value={draftQuery}
+          onChange={setDraftQuery}
+          onClear={handleSearchComponentClear}
+          onKeyDown={handleSearchKeyDown}
+          enterToSearch={false}
+          placeholder={t('configCenter.searchPlaceholder')}
+          inputAriaLabel={t('configCenter.searchPlaceholder')}
+          ariaControls="settings-nav-results"
+          ariaExpanded={isSearchMode}
+          clearable
+        />
+      </div>
+
+      <div
+        ref={resultsRef}
+        id="settings-nav-results"
+        className="bitfun-settings-nav__sections"
+        role={isSearchMode ? 'listbox' : undefined}
+        tabIndex={isSearchMode && results.length > 0 ? 0 : undefined}
+        onKeyDown={handleResultsKeyDown}
+        aria-activedescendant={
+          isSearchMode && highlightedIndex >= 0
+            ? `settings-nav-result-${results[highlightedIndex]?.tabId}`
+            : undefined
+        }
+      >
+        {isSearchMode ? (
+          <>
+            {results.length === 0 ? (
+              <div className="bitfun-settings-nav__search-empty" role="status">
+                {t('configCenter.searchNoResults')}
+              </div>
+            ) : (
+              <div className="bitfun-settings-nav__search-results">
+                {results.map((row, index) => {
+                  const line = `${row.categoryLabel} › ${row.tabLabel}`;
+                  const active = activeTab === row.tabId;
+                  const highlighted = highlightedIndex === index;
+                  return (
+                    <button
+                      key={row.tabId}
+                      type="button"
+                      id={`settings-nav-result-${row.tabId}`}
+                      role="option"
+                      aria-selected={active}
+                      className={[
+                        'bitfun-settings-nav__search-result-item',
+                        active && 'is-active',
+                        highlighted && 'is-highlighted',
+                      ]
+                        .filter(Boolean)
+                        .join(' ')}
+                      onClick={() => activateTab(row.tabId)}
+                      onMouseEnter={() => setHighlightedIndex(index)}
+                    >
+                      <span className="bitfun-settings-nav__search-result-line">
+                        {highlightFirstMatch(line, displayQuery)}
+                      </span>
+                      {row.description ? (
+                        <span className="bitfun-settings-nav__search-result-desc">
+                          {highlightFirstMatch(row.description, displayQuery)}
+                        </span>
+                      ) : null}
+                    </button>
+                  );
+                })}
+              </div>
+            )}
+          </>
+        ) : (
+          SETTINGS_CATEGORIES.map((category) => (
+            <div key={category.id} className="bitfun-settings-nav__category">
+              <div className="bitfun-settings-nav__category-header">
+                <span className="bitfun-settings-nav__category-label">
+                  {t(category.nameKey, { defaultValue: category.id })}
+                </span>
+              </div>
 
-            <div className="bitfun-settings-nav__items">
-              {category.tabs.map(tabDef => (
-                <button
-                  key={tabDef.id}
-                  type="button"
-                  className={[
-                    'bitfun-settings-nav__item',
-                    activeTab === tabDef.id && 'is-active',
-                  ].filter(Boolean).join(' ')}
-                  onClick={() => handleTabClick(tabDef.id)}
-                >
-                  {t(tabDef.labelKey, tabDef.id)}
-                </button>
-              ))}
+              <div className="bitfun-settings-nav__items">
+                {category.tabs.map((tabDef) => (
+                  <button
+                    key={tabDef.id}
+                    type="button"
+                    className={[
+                      'bitfun-settings-nav__item',
+                      activeTab === tabDef.id && 'is-active',
+                    ]
+                      .filter(Boolean)
+                      .join(' ')}
+                    onClick={() => handleTabClick(tabDef.id)}
+                  >
+                    {t(tabDef.labelKey, { defaultValue: tabDef.id })}
+                  </button>
+                ))}
+              </div>
             </div>
-          </div>
-        ))}
+          ))
+        )}
       </div>
     </div>
   );
diff --git a/src/web-ui/src/app/scenes/settings/SettingsScene.tsx b/src/web-ui/src/app/scenes/settings/SettingsScene.tsx
index bad7a09c..9bf7d587 100644
--- a/src/web-ui/src/app/scenes/settings/SettingsScene.tsx
+++ b/src/web-ui/src/app/scenes/settings/SettingsScene.tsx
@@ -14,27 +14,21 @@ const AIModelConfig        = lazy(() => import('../../../infrastructure/config/c
 const SessionConfig        = lazy(() => import('../../../infrastructure/config/components/SessionConfig'));
 const AIRulesMemoryConfig  = lazy(() => import('../../../infrastructure/config/components/AIRulesMemoryConfig'));
 const McpToolsConfig       = lazy(() => import('../../../infrastructure/config/components/McpToolsConfig'));
-const LspConfig            = lazy(() => import('../../../infrastructure/config/components/LspConfig'));
-const DebugConfig          = lazy(() => import('../../../infrastructure/config/components/DebugConfig'));
-const LoggingConfig        = lazy(() => import('../../../infrastructure/config/components/LoggingConfig'));
-const TerminalConfig       = lazy(() => import('../../../infrastructure/config/components/TerminalConfig'));
+// const LspConfig            = lazy(() => import('../../../infrastructure/config/components/LspConfig'));
 const EditorConfig         = lazy(() => import('../../../infrastructure/config/components/EditorConfig'));
-const ThemeConfigComponent = lazy(() => import('../../../infrastructure/config/components/ThemeConfig').then(m => ({ default: m.ThemeConfig })));
+const BasicsConfig         = lazy(() => import('../../../infrastructure/config/components/BasicsConfig'));
 const SettingsScene: React.FC = () => {
   const activeTab = useSettingsStore(s => s.activeTab);
 
   let Content: React.LazyExoticComponent<React.ComponentType> | null = null;
 
   switch (activeTab) {
-    case 'theme':            Content = ThemeConfigComponent; break;
+    case 'basics':           Content = BasicsConfig;         break;
     case 'models':           Content = AIModelConfig;        break;
     case 'session-config':   Content = SessionConfig;        break;
     case 'ai-context':       Content = AIRulesMemoryConfig; break;
     case 'mcp-tools':        Content = McpToolsConfig;      break;
-    case 'lsp':              Content = LspConfig;            break;
-    case 'debug':            Content = DebugConfig;          break;
-    case 'logging':          Content = LoggingConfig;        break;
-    case 'terminal':         Content = TerminalConfig;       break;
+    // case 'lsp':              Content = LspConfig;            break;
     case 'editor':           Content = EditorConfig;         break;
   }
 
diff --git a/src/web-ui/src/app/scenes/settings/settingsConfig.ts b/src/web-ui/src/app/scenes/settings/settingsConfig.ts
index 1ae5dd7c..3917afac 100644
--- a/src/web-ui/src/app/scenes/settings/settingsConfig.ts
+++ b/src/web-ui/src/app/scenes/settings/settingsConfig.ts
@@ -6,20 +6,21 @@
  */
 
 export type ConfigTab =
-  | 'theme'
+  | 'basics'
   | 'models'
   | 'session-config'
   | 'ai-context'
   | 'mcp-tools'
-  | 'lsp'
-  | 'debug'
-  | 'logging'
-  | 'terminal'
+  // | 'lsp' // temporarily hidden from config center
   | 'editor';
 
 export interface ConfigTabDef {
   id: ConfigTab;
   labelKey: string;
+  /** i18n key under settings namespace for tab description (search + discoverability). */
+  descriptionKey?: string;
+  /** Language-neutral extra tokens matched by search (ASCII recommended). */
+  keywords?: string[];
 }
 
 export interface ConfigCategoryDef {
@@ -33,30 +34,114 @@ export const SETTINGS_CATEGORIES: ConfigCategoryDef[] = [
     id: 'general',
     nameKey: 'configCenter.categories.general',
     tabs: [
-      { id: 'theme',   labelKey: 'configCenter.tabs.theme'   },
-      { id: 'models',  labelKey: 'configCenter.tabs.models'  },
+      {
+        id: 'basics',
+        labelKey: 'configCenter.tabs.basics',
+        descriptionKey: 'configCenter.tabDescriptions.basics',
+        keywords: [
+          'language',
+          'locale',
+          'i18n',
+          'theme',
+          'appearance',
+          'logging',
+          'log',
+          'terminal',
+          'shell',
+          'pwsh',
+          'powershell',
+        ],
+      },
+      {
+        id: 'models',
+        labelKey: 'configCenter.tabs.models',
+        descriptionKey: 'configCenter.tabDescriptions.models',
+        keywords: [
+          'api',
+          'api key',
+          'provider',
+          'openai',
+          'claude',
+          'gpt',
+          'base url',
+          'proxy',
+          'model',
+          'temperature',
+          'token',
+        ],
+      },
     ],
   },
   {
     id: 'smartCapabilities',
     nameKey: 'configCenter.categories.smartCapabilities',
     tabs: [
-      { id: 'session-config',    labelKey: 'configCenter.tabs.sessionConfig'   },
-      { id: 'ai-context',        labelKey: 'configCenter.tabs.aiContext'       },
-      { id: 'mcp-tools',         labelKey: 'configCenter.tabs.mcpTools'        },
+      {
+        id: 'session-config',
+        labelKey: 'configCenter.tabs.sessionConfig',
+        descriptionKey: 'configCenter.tabDescriptions.sessionConfig',
+        keywords: [
+          'session',
+          'chat',
+          'streaming',
+          'tool',
+          'timeout',
+          'confirmation',
+          'history',
+        ],
+      },
+      {
+        id: 'ai-context',
+        labelKey: 'configCenter.tabs.aiContext',
+        descriptionKey: 'configCenter.tabDescriptions.aiContext',
+        keywords: ['rules', 'memory', 'context', 'rag', 'knowledge'],
+      },
+      {
+        id: 'mcp-tools',
+        labelKey: 'configCenter.tabs.mcpTools',
+        descriptionKey: 'configCenter.tabDescriptions.mcpTools',
+        keywords: ['mcp', 'server', 'plugin', 'stdio', 'sse', 'tools'],
+      },
     ],
   },
   {
     id: 'devkit',
     nameKey: 'configCenter.categories.devkit',
     tabs: [
-      { id: 'editor',  labelKey: 'configCenter.tabs.editor'  },
-      // { id: 'lsp',     labelKey: 'configCenter.tabs.lsp'     },
-      { id: 'debug',   labelKey: 'configCenter.tabs.debug'   },
-      { id: 'terminal',labelKey: 'configCenter.tabs.terminal'},
-      { id: 'logging', labelKey: 'configCenter.tabs.logging' },
+      {
+        id: 'editor',
+        labelKey: 'configCenter.tabs.editor',
+        descriptionKey: 'configCenter.tabDescriptions.editor',
+        keywords: [
+          'font',
+          'indent',
+          'tab',
+          'minimap',
+          'word wrap',
+          'line number',
+          'format',
+          'save',
+        ],
+      },
+      // LSP / language server settings — temporarily hidden from nav
+      // {
+      //   id: 'lsp',
+      //   labelKey: 'configCenter.tabs.lsp',
+      //   descriptionKey: 'configCenter.tabDescriptions.lsp',
+      //   keywords: ['lsp', 'language server', 'typescript', 'intellisense'],
+      // },
     ],
   },
 ];
 
 export const DEFAULT_SETTINGS_TAB: ConfigTab = 'models';
+
+const KNOWN_TABS: ConfigTab[] = SETTINGS_CATEGORIES.flatMap((c) => c.tabs.map((t) => t.id));
+
+/** Map removed or renamed tabs; used by deep links and IDE actions. */
+export function normalizeSettingsTab(section: string): ConfigTab {
+  if (section === 'theme' || section === 'logging' || section === 'terminal') return 'basics';
+  if (section === 'lsp') return DEFAULT_SETTINGS_TAB;
+  if ((KNOWN_TABS as readonly string[]).includes(section)) return section as ConfigTab;
+  return DEFAULT_SETTINGS_TAB;
+}
diff --git a/src/web-ui/src/app/scenes/settings/settingsStore.ts b/src/web-ui/src/app/scenes/settings/settingsStore.ts
index 1c265760..0a468f17 100644
--- a/src/web-ui/src/app/scenes/settings/settingsStore.ts
+++ b/src/web-ui/src/app/scenes/settings/settingsStore.ts
@@ -12,12 +12,17 @@ import { DEFAULT_SETTINGS_TAB, SETTINGS_CATEGORIES } from './settingsConfig';
 interface SettingsState {
   activeTab: ConfigTab;
   setActiveTab: (tab: ConfigTab) => void;
+  /** Debounced from SettingsNav search input; used for filtering index. */
+  searchQuery: string;
+  setSearchQuery: (query: string) => void;
 }
 
 export const useSettingsStore = create<SettingsState>((set) => ({
   activeTab: DEFAULT_SETTINGS_TAB,
+  searchQuery: '',
 
   setActiveTab: (tab) => set({ activeTab: tab }),
+  setSearchQuery: (query) => set({ searchQuery: query }),
 }));
 
 /** Resolve the category id for a given tab (for initial scroll / highlight) */
diff --git a/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts b/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts
new file mode 100644
index 00000000..4642c9ac
--- /dev/null
+++ b/src/web-ui/src/app/scenes/settings/settingsTabSearchContent.ts
@@ -0,0 +1,97 @@
+/**
+ * i18n keys for in-page section titles/descriptions (and related copy) per settings tab.
+ * Used by SettingsNav search so queries match content inside each config page.
+ *
+ * Keep in sync when adding ConfigPageSection / page headers on these tabs.
+ */
+
+import type { ConfigTab } from './settingsConfig';
+
+export interface SettingsTabSearchPhrase {
+  ns: string;
+  key: string;
+}
+
+/** Phrases resolved at runtime with i18n.getFixedT(lang, ns)(key). */
+export const SETTINGS_TAB_SEARCH_CONTENT: Record<ConfigTab, readonly SettingsTabSearchPhrase[]> = {
+  basics: [
+    { ns: 'settings/basics', key: 'title' },
+    { ns: 'settings/basics', key: 'subtitle' },
+    { ns: 'settings/basics', key: 'appearance.title' },
+    { ns: 'settings/basics', key: 'appearance.hint' },
+    { ns: 'settings/basics', key: 'logging.sections.logging' },
+    { ns: 'settings/basics', key: 'logging.sections.loggingHint' },
+    { ns: 'settings/basics', key: 'terminal.sections.terminal' },
+    { ns: 'settings/basics', key: 'terminal.sections.terminalHint' },
+  ],
+
+  models: [
+    { ns: 'settings/ai-model', key: 'title' },
+    { ns: 'settings/ai-model', key: 'subtitle' },
+    { ns: 'settings/default-model', key: 'tabs.default' },
+    { ns: 'settings/default-model', key: 'subtitle' },
+    { ns: 'settings/default-model', key: 'tabs.models' },
+    { ns: 'settings/ai-model', key: 'subtitle' },
+    { ns: 'settings/default-model', key: 'tabs.proxy' },
+    { ns: 'settings/ai-model', key: 'proxy.enableHint' },
+  ],
+
+  'session-config': [
+    { ns: 'settings/session-config', key: 'title' },
+    { ns: 'settings/session-config', key: 'subtitle' },
+    { ns: 'settings/session-config', key: 'features.sessionTitle.title' },
+    { ns: 'settings/session-config', key: 'features.sessionTitle.subtitle' },
+    { ns: 'settings/session-config', key: 'toolExecution.sectionTitle' },
+    { ns: 'settings/session-config', key: 'toolExecution.sectionDescription' },
+    { ns: 'settings/agentic-tools', key: 'config.autoExecute' },
+    { ns: 'settings/agentic-tools', key: 'config.autoExecuteDesc' },
+    { ns: 'settings/agentic-tools', key: 'config.confirmTimeout' },
+    { ns: 'settings/agentic-tools', key: 'config.confirmTimeoutDesc' },
+    { ns: 'settings/agentic-tools', key: 'config.executionTimeout' },
+    { ns: 'settings/agentic-tools', key: 'config.executionTimeoutDesc' },
+    { ns: 'settings/debug', key: 'sections.combined' },
+    { ns: 'settings/debug', key: 'sections.combinedDescription' },
+    { ns: 'settings/debug', key: 'settings.logPath.label' },
+    { ns: 'settings/debug', key: 'settings.logPath.description' },
+    { ns: 'settings/debug', key: 'settings.ingestPort.label' },
+    { ns: 'settings/debug', key: 'settings.ingestPort.description' },
+    { ns: 'settings/debug', key: 'sections.templates' },
+    { ns: 'settings/debug', key: 'templates.description' },
+  ],
+
+  'ai-context': [
+    { ns: 'settings/ai-context', key: 'title' },
+    { ns: 'settings/ai-context', key: 'subtitle' },
+    { ns: 'settings/ai-context', key: 'scope.user' },
+    { ns: 'settings/ai-context', key: 'scope.project' },
+    { ns: 'settings/ai-context', key: 'memoryProjectPlaceholder' },
+    { ns: 'settings/ai-rules', key: 'title' },
+    { ns: 'settings/ai-rules', key: 'subtitle' },
+    { ns: 'settings/ai-memory', key: 'section.memoryList.title' },
+    { ns: 'settings/ai-memory', key: 'section.memoryList.description' },
+  ],
+
+  'mcp-tools': [
+    { ns: 'settings/mcp-tools', key: 'title' },
+    { ns: 'settings/mcp-tools', key: 'subtitle' },
+    { ns: 'settings/mcp', key: 'section.serverList.title' },
+    { ns: 'settings/mcp', key: 'section.serverList.description' },
+  ],
+
+  editor: [
+    { ns: 'settings/editor', key: 'title' },
+    { ns: 'settings/editor', key: 'subtitle' },
+    { ns: 'settings/editor', key: 'sections.appearance.title' },
+    { ns: 'settings/editor', key: 'sections.appearance.description' },
+    { ns: 'settings/editor', key: 'sections.behavior.title' },
+    { ns: 'settings/editor', key: 'sections.behavior.description' },
+    { ns: 'settings/editor', key: 'sections.display.title' },
+    { ns: 'settings/editor', key: 'sections.display.description' },
+    { ns: 'settings/editor', key: 'sections.advanced.title' },
+    { ns: 'settings/editor', key: 'sections.advanced.description' },
+    { ns: 'settings/editor', key: 'actions.save' },
+    { ns: 'settings/editor', key: 'actions.saveDesc' },
+  ],
+
+  // lsp: [ ... ], // nav entry temporarily hidden; omit from search index
+};
diff --git a/src/web-ui/src/component-library/components/Modal/Modal.scss b/src/web-ui/src/component-library/components/Modal/Modal.scss
index b856cefb..87553801 100644
--- a/src/web-ui/src/component-library/components/Modal/Modal.scss
+++ b/src/web-ui/src/component-library/components/Modal/Modal.scss
@@ -54,9 +54,7 @@
   background: var(--color-bg-primary);
   border: 1px solid var(--border-subtle);
   border-radius: 8px;
-  box-shadow:
-    0 24px 48px rgba(0, 0, 0, 0.5),
-    0 0 0 1px rgba(255, 255, 255, 0.03);
+  box-shadow: 0 16px 40px rgba(0, 0, 0, 0.45);
   max-height: calc(100vh - 48px);
   overflow: hidden;
   animation: modal-dialog-enter 0.3s cubic-bezier(0.16, 1, 0.3, 1);
@@ -90,16 +88,12 @@
     transition: box-shadow 0.2s ease;
 
     &:hover {
-      box-shadow:
-        0 28px 56px rgba(0, 0, 0, 0.55),
-        0 0 0 1px rgba(255, 255, 255, 0.05);
+      box-shadow: 0 20px 44px rgba(0, 0, 0, 0.5);
     }
   }
 
   &--dragging {
-    box-shadow:
-      0 32px 64px rgba(0, 0, 0, 0.6),
-      0 0 0 1px rgba(99, 102, 241, 0.2);
+    box-shadow: 0 20px 48px rgba(0, 0, 0, 0.55);
     z-index: tokens.$z-modal-active;
   }
 
@@ -109,6 +103,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    gap: 6px;
     padding: 6px 10px;
     border-bottom: 1px solid var(--border-subtle);
     background: transparent;
@@ -129,6 +124,7 @@
     align-items: center;
     gap: 6px;
     min-width: 0;
+    flex: 1;
   }
 
   &__title {
@@ -136,12 +132,15 @@
     font-size: 12px;
     font-weight: 500;
     color: var(--color-text-secondary);
+    min-width: 0;
+    flex-shrink: 1;
   }
 
   &__title-extra {
     display: flex;
     align-items: center;
     flex-shrink: 0;
+    margin-left: auto;
   }
 
 
@@ -282,7 +281,7 @@
   &--se { bottom: 0; right: 0; cursor: se-resize; }
 
   &:hover {
-    background-color: rgba(99, 102, 241, 0.15);
+    background-color: var(--element-bg-subtle);
   }
 }
 
diff --git a/src/web-ui/src/component-library/components/Search/Search.tsx b/src/web-ui/src/component-library/components/Search/Search.tsx
index 21d7a12a..18d7a8db 100644
--- a/src/web-ui/src/component-library/components/Search/Search.tsx
+++ b/src/web-ui/src/component-library/components/Search/Search.tsx
@@ -14,6 +14,8 @@ export interface SearchProps {
   onChange?: (value: string) => void;
   onSearch?: (value: string) => void;
   onClear?: () => void;
+  /** Fired before built-in key handling; call `preventDefault` to skip Enter/Escape behavior. */
+  onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;
   onFocus?: () => void;
   onBlur?: () => void;
   size?: 'small' | 'medium' | 'large';
@@ -30,6 +32,10 @@ export interface SearchProps {
   searchButtonText?: string;
   showSearchButton?: boolean;
   suffixContent?: React.ReactNode;
+  /** Overrides default aria-label on the input. */
+  inputAriaLabel?: string;
+  ariaControls?: string;
+  ariaExpanded?: boolean;
 }
 
 export const Search = forwardRef<HTMLInputElement, SearchProps>(({
@@ -40,6 +46,7 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(({
   onChange,
   onSearch,
   onClear,
+  onKeyDown: onKeyDownProp,
   onFocus: onFocusProp,
   onBlur: onBlurProp,
   size = 'medium',
@@ -56,6 +63,9 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(({
   searchButtonText,
   showSearchButton = false,
   suffixContent,
+  inputAriaLabel,
+  ariaControls,
+  ariaExpanded,
 }, ref) => {
   const { t } = useI18n('components');
   
@@ -104,8 +114,8 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(({
     }
   }, [inputValue, onSearch, disabled, loading]);
 
-  const handleClear = useCallback((e: React.MouseEvent) => {
-    e.stopPropagation();
+  const handleClear = useCallback((e?: React.SyntheticEvent) => {
+    e?.stopPropagation();
     setInputValue('');
     onChange?.('');
     onClear?.();
@@ -113,18 +123,22 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(({
   }, [onChange, onClear]);
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
+    onKeyDownProp?.(e);
+    if (e.defaultPrevented) {
+      return;
+    }
     if (e.key === 'Enter' && enterToSearch) {
       e.preventDefault();
       handleSearch();
     } else if (e.key === 'Escape') {
       e.preventDefault();
       if (inputValue) {
-        handleClear(e as any);
+        handleClear(e);
       } else {
         inputRef.current?.blur();
       }
     }
-  }, [inputValue, enterToSearch, handleSearch, handleClear]);
+  }, [inputValue, enterToSearch, handleSearch, handleClear, onKeyDownProp]);
 
   const handleFocus = useCallback(() => {
     setIsFocused(true);
@@ -225,7 +239,9 @@ export const Search = forwardRef<HTMLInputElement, SearchProps>(({
           onKeyDown={handleKeyDown}
           onFocus={handleFocus}
           onBlur={handleBlur}
-          aria-label={t('search.placeholder')}
+          aria-label={inputAriaLabel ?? t('search.placeholder')}
+          aria-controls={ariaControls}
+          aria-expanded={ariaExpanded}
         />
 
         {clearable && inputValue && !loading && !disabled && (
diff --git a/src/web-ui/src/flow_chat/components/CurrentSessionTitle.tsx b/src/web-ui/src/flow_chat/components/CurrentSessionTitle.tsx
index b755f2b6..30c4642c 100644
--- a/src/web-ui/src/flow_chat/components/CurrentSessionTitle.tsx
+++ b/src/web-ui/src/flow_chat/components/CurrentSessionTitle.tsx
@@ -4,11 +4,8 @@ import { Plus } from 'lucide-react';
 import { flowChatStore } from '../store/FlowChatStore';
 import { FlowChatState, Session } from '../types/flow-chat';
 import { Tooltip } from '@/component-library';
-import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import './CurrentSessionTitle.scss';
 
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
-
 interface CurrentSessionTitleProps {
   onCreateSession?: () => void;
 }
@@ -22,8 +19,6 @@ const CurrentSessionTitle: React.FC<CurrentSessionTitleProps> = ({ onCreateSessi
   const [flowChatState, setFlowChatState] = useState<FlowChatState>(() => 
     flowChatStore.getState()
   );
-  const [defaultMode, setDefaultMode] = useState<'code' | 'cowork'>('code');
-
   // Subscribe to FlowChatStore updates to keep the title in sync.
   useEffect(() => {
     const unsubscribe = flowChatStore.subscribe((state) => {
@@ -32,18 +27,6 @@ const CurrentSessionTitle: React.FC<CurrentSessionTitleProps> = ({ onCreateSessi
     return () => unsubscribe();
   }, []);
 
-  useEffect(() => {
-    configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-      if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-    }).catch(() => {});
-    const unwatch = configManager.watch(DEFAULT_MODE_CONFIG_KEY, () => {
-      configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-        if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-      }).catch(() => {});
-    });
-    return () => unwatch();
-  }, []);
-
   const activeSession: Session | undefined = flowChatState.activeSessionId 
     ? flowChatState.sessions.get(flowChatState.activeSessionId)
     : undefined;
@@ -64,7 +47,7 @@ const CurrentSessionTitle: React.FC<CurrentSessionTitleProps> = ({ onCreateSessi
     }
   };
 
-  const newSessionLabel = defaultMode === 'cowork' ? t('session.newCowork') : t('session.newCode');
+  const newSessionLabel = t('session.newCode');
 
   return (
     <div className="bitfun-current-session-title">
diff --git a/src/web-ui/src/flow_chat/components/toolbar-mode/ToolbarMode.tsx b/src/web-ui/src/flow_chat/components/toolbar-mode/ToolbarMode.tsx
index ba8714a4..15a3827d 100644
--- a/src/web-ui/src/flow_chat/components/toolbar-mode/ToolbarMode.tsx
+++ b/src/web-ui/src/flow_chat/components/toolbar-mode/ToolbarMode.tsx
@@ -33,11 +33,8 @@ import { createLogger } from '@/shared/utils/logger';
 const log = createLogger('ToolbarMode');
 import { ModernFlowChatContainer } from '../modern/ModernFlowChatContainer';
 import { Tooltip } from '@/component-library';
-import { configManager } from '@/infrastructure/config/services/ConfigManager';
 import './ToolbarMode.scss';
 
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
-
 // Window size config (physical pixels, accounts for Windows DPI scaling).
 const TOOLBAR_WIDTH = 600;
 const TOOLBAR_HEIGHT_NORMAL = 120;  // Two-row height (32px + ~88px).
@@ -59,21 +56,8 @@ export const ToolbarMode: React.FC = () => {
   const [flowChatState, setFlowChatState] = useState<FlowChatState>(() => 
     flowChatStore.getState()
   );
-  const [defaultMode, setDefaultMode] = useState<'code' | 'cowork'>('code');
   const sessionPickerRef = useRef<HTMLDivElement>(null);
 
-  useEffect(() => {
-    configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-      if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-    }).catch(() => {});
-    const unwatch = configManager.watch(DEFAULT_MODE_CONFIG_KEY, () => {
-      configManager.getConfig<'code' | 'cowork'>(DEFAULT_MODE_CONFIG_KEY).then(mode => {
-        if (mode === 'code' || mode === 'cowork') setDefaultMode(mode);
-      }).catch(() => {});
-    });
-    return () => unwatch();
-  }, []);
-
   useEffect(() => {
     const unsubscribe = flowChatStore.subscribe((state) => {
       setFlowChatState(state);
@@ -346,7 +330,7 @@ export const ToolbarMode: React.FC = () => {
       )}
       
       <div className="bitfun-toolbar-mode__header">
-        <Tooltip content={defaultMode === 'cowork' ? t('session.newCowork') : t('session.newCode')}>
+        <Tooltip content={t('session.newCode')}>
           <button
             className="bitfun-toolbar-mode__create-btn"
             onClick={handleCreateSession}
diff --git a/src/web-ui/src/infrastructure/config/components/AIFeaturesConfig.tsx b/src/web-ui/src/infrastructure/config/components/AIFeaturesConfig.tsx
index 5fdfcbee..9c855b7c 100644
--- a/src/web-ui/src/infrastructure/config/components/AIFeaturesConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/AIFeaturesConfig.tsx
@@ -4,7 +4,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Switch, ConfigPageLoading } from '@/component-library';
 import { ConfigPageHeader, ConfigPageLayout, ConfigPageContent, ConfigPageSection, ConfigPageRow } from './common';
-import { aiExperienceConfigService } from '../services/AIExperienceConfigService';
+import { aiExperienceConfigService, type AIExperienceSettings } from '../services/AIExperienceConfigService';
 import { configManager } from '../services/ConfigManager';
 import { useNotification, notificationService } from '@/shared/notification-system';
 import type { AIModelConfig } from '../types';
@@ -14,18 +14,6 @@ import './AIFeaturesConfig.scss';
 
 const log = createLogger('AIFeaturesConfig');
 
-
-interface AIExperienceSettings {
-  enable_session_title_generation: boolean;
-  enable_welcome_panel_ai_analysis: boolean;
-}
-
-const defaultSettings: AIExperienceSettings = {
-  enable_session_title_generation: true,
-  enable_welcome_panel_ai_analysis: true,
-};
-
-
 interface FeatureConfig {
   id: string;
   settingKey?: keyof AIExperienceSettings;  
@@ -39,11 +27,6 @@ const FEATURE_CONFIGS: FeatureConfig[] = [
     settingKey: 'enable_session_title_generation',
     agentName: 'startchat-func-agent',
   },
-  {
-    id: 'welcomeAnalysis',
-    settingKey: 'enable_welcome_panel_ai_analysis',
-    agentName: 'startchat-func-agent',  
-  },
 ];
 
 const AIFeaturesConfig: React.FC = () => {
@@ -51,7 +34,9 @@ const AIFeaturesConfig: React.FC = () => {
   const notification = useNotification();
   
   
-  const [settings, setSettings] = useState<AIExperienceSettings>(defaultSettings);
+  const [settings, setSettings] = useState<AIExperienceSettings>(() =>
+    aiExperienceConfigService.getSettings()
+  );
   const [isLoading, setIsLoading] = useState(true);
   
   
@@ -81,7 +66,7 @@ const AIFeaturesConfig: React.FC = () => {
       setFuncAgentModels(funcAgentModelsData);
     } catch (error) {
       log.error('Failed to load data', error);
-      setSettings(defaultSettings);
+      setSettings(aiExperienceConfigService.getSettings());
     } finally {
       setIsLoading(false);
     }
diff --git a/src/web-ui/src/infrastructure/config/components/ThemeConfig.scss b/src/web-ui/src/infrastructure/config/components/BasicsConfig.scss
similarity index 80%
rename from src/web-ui/src/infrastructure/config/components/ThemeConfig.scss
rename to src/web-ui/src/infrastructure/config/components/BasicsConfig.scss
index 47dada15..fc322f48 100644
--- a/src/web-ui/src/infrastructure/config/components/ThemeConfig.scss
+++ b/src/web-ui/src/infrastructure/config/components/BasicsConfig.scss
@@ -1,7 +1,12 @@
- 
-
 @use '../../../component-library/styles/tokens.scss' as *;
 
+.bitfun-basics-config__content {
+  display: flex;
+  flex-direction: column;
+  gap: $size-gap-6;
+  padding: 0;
+}
+
 .theme-config {
   &__content {
     display: flex;
@@ -676,3 +681,136 @@
   }
 }
 
+.bitfun-logging-config {
+  &__content {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  &__select-wrapper {
+    width: 100%;
+  }
+
+  &__path-row {
+    display: flex;
+    align-items: stretch;
+    gap: 8px;
+    width: 100%;
+
+    .bitfun-logging-config__path-box {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  &__open-btn {
+    flex-shrink: 0;
+    align-self: stretch;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 36px;
+    min-width: 36px;
+    padding: 0;
+    border: 1px solid transparent;
+    border-radius: 6px;
+    background: transparent;
+    color: var(--color-text-secondary);
+    cursor: pointer;
+    transition: background 0.15s, color 0.15s, border-color 0.15s;
+
+    &:hover:not(:disabled) {
+      background: var(--element-bg-base, rgba(255, 255, 255, 0.08));
+      border-color: var(--border-subtle);
+      color: var(--color-text-primary);
+    }
+
+    &:active:not(:disabled) {
+      background: var(--element-bg-medium, rgba(255, 255, 255, 0.14));
+    }
+
+    &:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+    }
+  }
+
+  &__path-box {
+    width: 100%;
+    padding: 10px 12px;
+    border-radius: 6px;
+    background: transparent;
+    border: 1px dashed var(--border-base);
+    color: var(--color-text-primary);
+    font-family: var(--font-family-mono, Consolas, "Courier New", monospace);
+    font-size: 12px;
+    word-break: break-all;
+    overflow-wrap: anywhere;
+    line-height: 1.6;
+    user-select: text;
+  }
+}
+
+
+.bitfun-terminal-config {
+  &__content {
+    display: flex;
+    flex-direction: column;
+    gap: $size-gap-6;
+  }
+
+  &__section-hint-sep {
+    color: var(--color-text-muted);
+    opacity: 0.9;
+  }
+
+  &__section-hint-extra {
+    display: inline;
+    color: var(--color-text-muted);
+    font-size: 0.92em;
+    font-weight: $font-weight-normal;
+  }
+
+  &__section-hint-extra-name {
+    font-weight: $font-weight-medium;
+    color: var(--color-text-secondary);
+  }
+
+  &__section-hint-link {
+    color: inherit;
+    text-decoration: underline;
+    text-underline-offset: 2px;
+
+    &:hover {
+      color: var(--color-text-secondary);
+    }
+  }
+
+  &__select-wrapper {
+    width: 100%;
+  }
+
+  &__no-shells {
+    padding: 12px 16px;
+    border: 1px dashed var(--border-base);
+    border-radius: $size-radius-sm;
+    color: var(--color-text-muted);
+    font-size: $font-size-sm;
+  }
+
+  &__inline-alert {
+    border-top: 1px solid var(--border-subtle);
+    padding: $size-gap-3;
+  }
+
+}
+
+@container config-panel (max-width: 520px) {
+  .bitfun-terminal-config {
+    &__inline-alert {
+      padding: $size-gap-2;
+    }
+  }
+}
+
diff --git a/src/web-ui/src/infrastructure/config/components/BasicsConfig.tsx b/src/web-ui/src/infrastructure/config/components/BasicsConfig.tsx
new file mode 100644
index 00000000..5f0ad5f8
--- /dev/null
+++ b/src/web-ui/src/infrastructure/config/components/BasicsConfig.tsx
@@ -0,0 +1,777 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { FolderOpen, Upload } from 'lucide-react';
+import {
+  Alert,
+  Select,
+  Tooltip,
+  ConfigPageLoading,
+  ConfigPageMessage,
+  ConfigPageRefreshButton,
+  IconButton,
+} from '@/component-library';
+import { configAPI, workspaceAPI } from '@/infrastructure/api';
+import { systemAPI } from '@/infrastructure/api/service-api/SystemAPI';
+import { getTerminalService } from '@/tools/terminal';
+import type { ShellInfo } from '@/tools/terminal/types/session';
+import {
+  useTheme,
+  useThemeManagement,
+  ThemeMetadata,
+  ThemeConfig as ThemeConfigType,
+} from '@/infrastructure/theme';
+import { themeService } from '@/infrastructure/theme/core/ThemeService';
+import { useLanguageSelector } from '@/infrastructure/i18n';
+import type { LocaleId } from '@/infrastructure/i18n/types';
+import {
+  ConfigPageContent,
+  ConfigPageHeader,
+  ConfigPageLayout,
+  ConfigPageSection,
+  ConfigPageRow,
+} from './common';
+import { configManager } from '../services/ConfigManager';
+import { createLogger } from '@/shared/utils/logger';
+import type { BackendLogLevel, RuntimeLoggingInfo, TerminalConfig as TerminalSettings } from '../types';
+import './BasicsConfig.scss';
+
+const log = createLogger('BasicsConfig');
+
+function BasicsAppearanceSection() {
+  const { t } = useTranslation('settings/basics');
+  const { themeId, themes, setTheme, loading } = useTheme();
+  const { importTheme } = useThemeManagement();
+  const { currentLanguage, supportedLocales, selectLanguage, isChanging } = useLanguageSelector();
+  const [importing, setImporting] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const handleThemeChange = async (newThemeId: string) => {
+    await setTheme(newThemeId);
+  };
+
+  const handleImportTheme = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (!file) return;
+
+    setImporting(true);
+    try {
+      const text = await file.text();
+      const themeData = JSON.parse(text);
+      await importTheme(themeData);
+      alert(t('appearance.importSuccess'));
+    } catch (error) {
+      log.error('Failed to import theme', error);
+      alert(t('appearance.importFailed'));
+    } finally {
+      setImporting(false);
+      event.target.value = '';
+    }
+  };
+
+  const handleImportClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  const getThemeDisplayName = (theme: ThemeMetadata) => {
+    const i18nKey = `appearance.presets.${theme.id}`;
+    return theme.builtin
+      ? t(`${i18nKey}.name`, { defaultValue: theme.name })
+      : theme.name;
+  };
+
+  const getThemeDisplayDescription = (theme: ThemeMetadata) => {
+    const i18nKey = `appearance.presets.${theme.id}`;
+    return theme.builtin
+      ? t(`${i18nKey}.description`, { defaultValue: theme.description || '' })
+      : theme.description || '';
+  };
+
+  return (
+    <div className="theme-config">
+      <div className="theme-config__content">
+        <ConfigPageSection
+          title={t('appearance.title')}
+          description={t('appearance.hint')}
+          extra={
+            <>
+              <IconButton
+                variant="ghost"
+                size="small"
+                onClick={handleImportClick}
+                disabled={importing || loading}
+                isLoading={importing}
+                title={importing ? t('appearance.importing') : t('appearance.importTheme')}
+              >
+                <Upload size={16} />
+              </IconButton>
+              <input
+                ref={fileInputRef}
+                type="file"
+                accept=".json"
+                onChange={handleImportTheme}
+                style={{ display: 'none' }}
+              />
+            </>
+          }
+        >
+          <ConfigPageRow
+            label={t('appearance.language')}
+            description={t('appearance.languageRowHint', {
+              defaultValue: 'Choose one language pack as the active UI language.',
+            })}
+            align="center"
+          >
+            <div className="theme-config__language-select">
+              <Select
+                value={currentLanguage}
+                onChange={(value) =>
+                  selectLanguage(String(Array.isArray(value) ? value[0] ?? '' : value) as LocaleId)
+                }
+                options={supportedLocales.map((locale) => ({
+                  value: locale.id,
+                  label: locale.nativeName,
+                }))}
+                disabled={isChanging}
+                placeholder={t('appearance.language')}
+              />
+            </div>
+          </ConfigPageRow>
+          <ConfigPageRow
+            label={t('appearance.themes')}
+            description={t('appearance.themeRowHint', {
+              defaultValue: 'Pick an installed theme or manage custom themes.',
+            })}
+            align="center"
+          >
+            <div className="theme-config__theme-picker">
+              <div className="theme-config__theme-select">
+                <Select
+                  value={themeId ?? ''}
+                  onChange={(value) => handleThemeChange(value as string)}
+                  disabled={loading}
+                  options={themes.map((theme) => ({
+                    value: theme.id,
+                    label: getThemeDisplayName(theme),
+                    description: getThemeDisplayDescription(theme),
+                  }))}
+                  renderOption={(option) => {
+                    const theme = themes.find((item) => item.id === String(option.value));
+                    const fullTheme = theme ? themeService.getTheme(theme.id) : null;
+                    const optionContent = (
+                      <div className="theme-config__theme-option">
+                        <span className="theme-config__theme-option-name">{option.label}</span>
+                        {option.description && (
+                          <span className="theme-config__theme-option-desc">{option.description}</span>
+                        )}
+                      </div>
+                    );
+
+                    if (!fullTheme) return optionContent;
+
+                    return (
+                      <Tooltip
+                        content={<ThemePreviewThumbnail theme={fullTheme} />}
+                        placement="right"
+                        delay={300}
+                        className="theme-preview-tooltip"
+                      >
+                        {optionContent}
+                      </Tooltip>
+                    );
+                  }}
+                />
+              </div>
+            </div>
+          </ConfigPageRow>
+        </ConfigPageSection>
+      </div>
+    </div>
+  );
+}
+
+function BasicsLoggingSection() {
+  const { t } = useTranslation('settings/basics');
+  const [configLevel, setConfigLevel] = useState<BackendLogLevel>('info');
+  const [runtimeInfo, setRuntimeInfo] = useState<RuntimeLoggingInfo | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [openingFolder, setOpeningFolder] = useState(false);
+  const [message, setMessage] = useState<{ type: 'success' | 'error' | 'info'; text: string } | null>(null);
+
+  const levelOptions = useMemo(
+    () => [
+      { value: 'trace', label: t('logging.levels.trace') },
+      { value: 'debug', label: t('logging.levels.debug') },
+      { value: 'info', label: t('logging.levels.info') },
+      { value: 'warn', label: t('logging.levels.warn') },
+      { value: 'error', label: t('logging.levels.error') },
+      { value: 'off', label: t('logging.levels.off') },
+    ],
+    [t]
+  );
+
+  const showMessage = useCallback((type: 'success' | 'error' | 'info', text: string) => {
+    setMessage({ type, text });
+    setTimeout(() => setMessage(null), 3000);
+  }, []);
+
+  const loadData = useCallback(async () => {
+    try {
+      setLoading(true);
+
+      const [savedLevel, info] = await Promise.all([
+        configManager.getConfig<BackendLogLevel>('app.logging.level'),
+        configAPI.getRuntimeLoggingInfo(),
+      ]);
+
+      setConfigLevel(savedLevel || info.effectiveLevel || 'info');
+      setRuntimeInfo(info);
+    } catch (error) {
+      log.error('Failed to load logging config', error);
+      showMessage('error', t('logging.messages.loadFailed'));
+    } finally {
+      setLoading(false);
+    }
+  }, [showMessage, t]);
+
+  useEffect(() => {
+    loadData();
+  }, [loadData]);
+
+  const handleLevelChange = useCallback(
+    async (value: string) => {
+      const nextLevel = value as BackendLogLevel;
+      const previousLevel = configLevel;
+      setConfigLevel(nextLevel);
+      setSaving(true);
+
+      try {
+        await configManager.setConfig('app.logging.level', nextLevel);
+        configManager.clearCache();
+
+        const info = await configAPI.getRuntimeLoggingInfo();
+        setRuntimeInfo(info);
+        showMessage('success', t('logging.messages.levelUpdated'));
+      } catch (error) {
+        setConfigLevel(previousLevel);
+        log.error('Failed to update logging level', { nextLevel, error });
+        showMessage('error', t('logging.messages.saveFailed'));
+      } finally {
+        setSaving(false);
+      }
+    },
+    [configLevel, showMessage, t]
+  );
+
+  const handleRefresh = useCallback(async () => {
+    await loadData();
+    showMessage('info', t('logging.messages.refreshed'));
+  }, [loadData, showMessage, t]);
+
+  const handleOpenFolder = useCallback(async () => {
+    const folder = runtimeInfo?.sessionLogDir;
+    if (!folder) {
+      showMessage('error', t('logging.messages.pathUnavailable'));
+      return;
+    }
+
+    try {
+      setOpeningFolder(true);
+      await workspaceAPI.revealInExplorer(folder);
+    } catch (error) {
+      log.error('Failed to open log folder', { folder, error });
+      showMessage('error', t('logging.messages.openFailed'));
+    } finally {
+      setOpeningFolder(false);
+    }
+  }, [runtimeInfo?.sessionLogDir, showMessage, t]);
+
+  if (loading) {
+    return <ConfigPageLoading text={t('logging.messages.loading')} />;
+  }
+
+  return (
+    <div className="bitfun-logging-config">
+      <div className="bitfun-logging-config__content">
+        <ConfigPageMessage message={message} />
+
+        <ConfigPageSection
+          title={t('logging.sections.logging')}
+          description={t('logging.sections.loggingHint')}
+          extra={
+            <ConfigPageRefreshButton
+              tooltip={t('logging.actions.refreshTooltip')}
+              onClick={handleRefresh}
+              loading={loading}
+              disabled={loading || saving}
+            />
+          }
+        >
+          <ConfigPageRow
+            label={t('logging.sections.level')}
+            description={t('logging.level.description')}
+            align="center"
+          >
+            <div className="bitfun-logging-config__select-wrapper">
+              <Select
+                value={configLevel}
+                onChange={(v) => handleLevelChange(v as string)}
+                options={levelOptions}
+                disabled={saving}
+              />
+            </div>
+          </ConfigPageRow>
+          <ConfigPageRow
+            label={t('logging.sections.path')}
+            description={t('logging.path.description')}
+            multiline
+          >
+            <div className="bitfun-logging-config__path-row">
+              <div className="bitfun-logging-config__path-box">
+                {runtimeInfo?.sessionLogDir || '-'}
+              </div>
+              <Tooltip content={t('logging.actions.openFolderTooltip')} placement="top">
+                <button
+                  type="button"
+                  className="bitfun-logging-config__open-btn"
+                  onClick={handleOpenFolder}
+                  disabled={openingFolder || !runtimeInfo?.sessionLogDir}
+                >
+                  <FolderOpen size={14} />
+                </button>
+              </Tooltip>
+            </div>
+          </ConfigPageRow>
+        </ConfigPageSection>
+      </div>
+    </div>
+  );
+}
+
+function BasicsTerminalSection() {
+  const { t } = useTranslation('settings/basics');
+  const [defaultShell, setDefaultShell] = useState<string>('');
+  const [availableShells, setAvailableShells] = useState<ShellInfo[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [message, setMessage] = useState<{ type: 'success' | 'error' | 'info'; text: string } | null>(null);
+  const [platform, setPlatform] = useState<string>('');
+
+  const showMessage = useCallback((type: 'success' | 'error' | 'info', text: string) => {
+    setMessage({ type, text });
+    setTimeout(() => setMessage(null), 3000);
+  }, []);
+
+  const loadData = useCallback(async () => {
+    try {
+      setLoading(true);
+
+      const [terminalConfig, shells, systemInfo] = await Promise.all([
+        configManager.getConfig<TerminalSettings>('terminal'),
+        getTerminalService().getAvailableShells(),
+        systemAPI.getSystemInfo().catch(() => ({ platform: '' })),
+      ]);
+
+      setDefaultShell(terminalConfig?.default_shell || '');
+
+      const availableOnly = shells.filter((s) => s.available);
+      setAvailableShells(availableOnly);
+
+      setPlatform(systemInfo.platform || '');
+    } catch (error) {
+      log.error('Failed to load terminal config data', error);
+      showMessage('error', t('terminal.messages.loadFailed'));
+    } finally {
+      setLoading(false);
+    }
+  }, [showMessage, t]);
+
+  useEffect(() => {
+    loadData();
+  }, [loadData]);
+
+  const handleShellChange = useCallback(
+    async (value: string) => {
+      try {
+        setSaving(true);
+        setDefaultShell(value);
+
+        await configManager.setConfig('terminal.default_shell', value);
+
+        configManager.clearCache();
+
+        showMessage('success', t('terminal.messages.updated'));
+      } catch (error) {
+        log.error('Failed to save terminal config', { shell: value, error });
+        showMessage('error', t('terminal.messages.saveFailed'));
+      } finally {
+        setSaving(false);
+      }
+    },
+    [showMessage, t]
+  );
+
+  const handleRefresh = useCallback(async () => {
+    await loadData();
+    showMessage('info', t('terminal.messages.refreshed'));
+  }, [loadData, showMessage, t]);
+
+  const shouldShowPowerShellCoreRecommendation = useMemo(() => {
+    const isWindows = platform === 'windows';
+    if (!isWindows) return false;
+
+    const hasPowerShellCore = availableShells.some((shell) => shell.shellType === 'PowerShellCore');
+
+    return !hasPowerShellCore;
+  }, [availableShells, platform]);
+
+  const shellOptions = useMemo(
+    () => [
+      { value: '', label: t('terminal.controls.autoDetect') },
+      ...availableShells.map((shell) => ({
+        value: shell.shellType,
+        label: `${shell.name}${shell.version ? ` (${shell.version})` : ''}`,
+      })),
+    ],
+    [availableShells, t]
+  );
+
+  const terminalSectionDescription = useMemo(() => {
+    const hint = t('terminal.sections.terminalHint');
+    if (!shouldShowPowerShellCoreRecommendation) {
+      return hint;
+    }
+    return (
+      <>
+        {hint}
+        <span className="bitfun-terminal-config__section-hint-sep"> · </span>
+        <span className="bitfun-terminal-config__section-hint-extra">
+          {t('terminal.recommendations.pwsh.prefix')}{' '}
+          <span className="bitfun-terminal-config__section-hint-extra-name">
+            {t('terminal.recommendations.pwsh.name')}
+          </span>
+          {t('terminal.recommendations.pwsh.suffix')}{' '}
+          <a
+            href="https://aka.ms/PSWindows"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="bitfun-terminal-config__section-hint-link"
+          >
+            {t('terminal.recommendations.pwsh.link')}
+          </a>
+        </span>
+      </>
+    );
+  }, [shouldShowPowerShellCoreRecommendation, t]);
+
+  if (loading) {
+    return <ConfigPageLoading text={t('terminal.messages.loading')} />;
+  }
+
+  return (
+    <div className="bitfun-terminal-config">
+      <div className="bitfun-terminal-config__content">
+        <ConfigPageMessage message={message} />
+
+        <ConfigPageSection
+          title={t('terminal.sections.terminal')}
+          description={terminalSectionDescription}
+          extra={
+            <ConfigPageRefreshButton
+              tooltip={t('terminal.controls.refreshTooltip')}
+              onClick={handleRefresh}
+              loading={loading}
+              disabled={loading}
+            />
+          }
+        >
+          <ConfigPageRow
+            label={t('terminal.sections.defaultTerminal')}
+            description={t('terminal.controls.description')}
+            align="center"
+          >
+            <div className="bitfun-terminal-config__select-wrapper">
+              {availableShells.length > 0 ? (
+                <Select
+                  value={defaultShell}
+                  onChange={(v) => handleShellChange(v as string)}
+                  options={shellOptions}
+                  placeholder={t('terminal.controls.placeholder')}
+                  disabled={saving}
+                />
+              ) : (
+                <div className="bitfun-terminal-config__no-shells">{t('terminal.controls.noShells')}</div>
+              )}
+            </div>
+          </ConfigPageRow>
+
+          {platform === 'windows' && defaultShell === 'Cmd' && (
+            <div className="bitfun-terminal-config__inline-alert">
+              <Alert type="warning" message={t('terminal.warnings.cmd')} />
+            </div>
+          )}
+          {platform === 'windows' && defaultShell === 'Bash' && (
+            <div className="bitfun-terminal-config__inline-alert">
+              <Alert type="warning" message={t('terminal.warnings.gitBash')} />
+            </div>
+          )}
+        </ConfigPageSection>
+      </div>
+    </div>
+  );
+}
+
+interface ThemePreviewThumbnailProps {
+  theme: ThemeConfigType;
+}
+
+function ThemePreviewThumbnail({ theme }: ThemePreviewThumbnailProps) {
+  const { colors } = theme;
+
+  return (
+    <div
+      className="theme-preview-thumbnail"
+      style={{
+        background: colors.background.primary,
+        borderColor: colors.border.base,
+      }}
+    >
+      <div
+        className="theme-preview-thumbnail__titlebar"
+        style={{
+          background: colors.background.secondary,
+          borderColor: colors.border.subtle,
+        }}
+      >
+        <div className="theme-preview-thumbnail__menu">
+          <span
+            className="theme-preview-thumbnail__menu-dot"
+            style={{ background: colors.accent['500'] }}
+          />
+        </div>
+
+        <div className="theme-preview-thumbnail__title" style={{ color: colors.text.muted }}>
+          BitFun
+        </div>
+
+        <div className="theme-preview-thumbnail__window-controls">
+          <span className="theme-preview-thumbnail__window-btn" style={{ color: colors.text.secondary }}>
+            <svg width="8" height="8" viewBox="0 0 14 14" fill="none">
+              <line x1="3" y1="7" x2="11" y2="7" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+            </svg>
+          </span>
+
+          <span className="theme-preview-thumbnail__window-btn" style={{ color: colors.text.secondary }}>
+            <svg width="8" height="8" viewBox="0 0 12 12" fill="none">
+              <rect
+                x="2"
+                y="2"
+                width="8"
+                height="8"
+                stroke="currentColor"
+                strokeWidth="1.5"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              />
+            </svg>
+          </span>
+
+          <span
+            className="theme-preview-thumbnail__window-btn theme-preview-thumbnail__window-btn--close"
+            style={{ color: colors.text.secondary }}
+          >
+            <svg width="8" height="8" viewBox="0 0 14 14" fill="none">
+              <line x1="3" y1="3" x2="11" y2="11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+              <line x1="11" y1="3" x2="3" y2="11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+            </svg>
+          </span>
+        </div>
+      </div>
+
+      <div className="theme-preview-thumbnail__main">
+        <div
+          className="theme-preview-thumbnail__sidebar"
+          style={{
+            background: colors.background.secondary,
+            borderColor: colors.border.subtle,
+          }}
+        >
+          <div className="theme-preview-thumbnail__tree-item">
+            <span
+              className="theme-preview-thumbnail__folder-icon"
+              style={{ background: colors.accent['500'] }}
+            />
+            <span
+              className="theme-preview-thumbnail__tree-text"
+              style={{ background: colors.text.secondary }}
+            />
+          </div>
+
+          {[1, 2, 3].map((i) => (
+            <div key={i} className="theme-preview-thumbnail__tree-item theme-preview-thumbnail__tree-item--file">
+              <span
+                className="theme-preview-thumbnail__file-icon"
+                style={{ background: colors.semantic.info }}
+              />
+              <span
+                className="theme-preview-thumbnail__tree-text theme-preview-thumbnail__tree-text--short"
+                style={{ background: colors.text.muted }}
+              />
+            </div>
+          ))}
+        </div>
+
+        <div className="theme-preview-thumbnail__chat" style={{ background: colors.background.scene }}>
+          <div
+            className="theme-preview-thumbnail__message theme-preview-thumbnail__message--user"
+            style={{
+              background: colors.accent['200'],
+              borderColor: colors.accent['400'],
+            }}
+          >
+            <div
+              className="theme-preview-thumbnail__message-line"
+              style={{ background: colors.text.primary }}
+            />
+          </div>
+
+          <div
+            className="theme-preview-thumbnail__message theme-preview-thumbnail__message--ai"
+            style={{
+              background: colors.element.subtle,
+              borderColor: colors.border.subtle,
+            }}
+          >
+            <div
+              className="theme-preview-thumbnail__message-line"
+              style={{ background: colors.text.secondary }}
+            />
+            <div
+              className="theme-preview-thumbnail__message-line theme-preview-thumbnail__message-line--short"
+              style={{ background: colors.text.muted }}
+            />
+          </div>
+
+          <div
+            className="theme-preview-thumbnail__code-block"
+            style={{
+              background: colors.background.tertiary,
+              borderColor: colors.border.base,
+            }}
+          >
+            <div
+              className="theme-preview-thumbnail__code-line"
+              style={{ background: colors.purple?.['500'] || colors.accent['500'] }}
+            />
+            <div
+              className="theme-preview-thumbnail__code-line theme-preview-thumbnail__code-line--long"
+              style={{ background: colors.semantic.success }}
+            />
+          </div>
+        </div>
+
+        <div
+          className="theme-preview-thumbnail__editor"
+          style={{
+            background: colors.background.workbench,
+            borderColor: colors.border.subtle,
+          }}
+        >
+          <div
+            className="theme-preview-thumbnail__tabs"
+            style={{
+              background: colors.background.secondary,
+              borderColor: colors.border.subtle,
+            }}
+          >
+            <span
+              className="theme-preview-thumbnail__tab theme-preview-thumbnail__tab--active"
+              style={{
+                background: colors.background.primary,
+                borderColor: colors.accent['500'],
+              }}
+            />
+            <span
+              className="theme-preview-thumbnail__tab"
+              style={{ background: colors.element.subtle }}
+            />
+          </div>
+
+          <div className="theme-preview-thumbnail__code-content">
+            {[1, 2, 3, 4, 5].map((i) => (
+              <div key={i} className="theme-preview-thumbnail__editor-line">
+                <span
+                  className="theme-preview-thumbnail__line-number"
+                  style={{ background: colors.text.disabled }}
+                />
+                <span
+                  className="theme-preview-thumbnail__line-code"
+                  style={{
+                    background: i % 2 === 0 ? colors.accent['500'] : colors.text.secondary,
+                    width: `${30 + (i * 8) % 40}%`,
+                  }}
+                />
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+
+      <div
+        className="theme-preview-thumbnail__statusbar"
+        style={{
+          background: colors.background.secondary,
+          borderColor: colors.border.subtle,
+        }}
+      >
+        <div className="theme-preview-thumbnail__status-section">
+          <span
+            className="theme-preview-thumbnail__status-icon"
+            style={{ background: colors.accent['500'] }}
+          />
+          <span
+            className="theme-preview-thumbnail__status-text"
+            style={{ background: colors.text.muted }}
+          />
+        </div>
+
+        <div className="theme-preview-thumbnail__status-section">
+          <span className="theme-preview-thumbnail__git-icon" style={{ color: colors.git.branch }}>
+            <svg width="7" height="7" viewBox="0 0 16 16" fill="none">
+              <circle cx="4" cy="4" r="2" stroke="currentColor" strokeWidth="1.5" />
+              <circle cx="12" cy="12" r="2" stroke="currentColor" strokeWidth="1.5" />
+              <circle cx="12" cy="4" r="2" stroke="currentColor" strokeWidth="1.5" />
+              <path d="M4 6v4c0 1.1.9 2 2 2h4" stroke="currentColor" strokeWidth="1.5" />
+            </svg>
+          </span>
+          <span
+            className="theme-preview-thumbnail__status-text theme-preview-thumbnail__status-text--branch"
+            style={{ background: colors.git.branch }}
+          />
+        </div>
+
+        <span
+          className="theme-preview-thumbnail__status-icon theme-preview-thumbnail__status-icon--notification"
+          style={{ background: colors.semantic.info }}
+        />
+      </div>
+    </div>
+  );
+}
+
+const BasicsConfig: React.FC = () => {
+  const { t } = useTranslation('settings/basics');
+
+  return (
+    <ConfigPageLayout className="bitfun-basics-config">
+      <ConfigPageHeader title={t('title')} subtitle={t('subtitle')} />
+      <ConfigPageContent className="bitfun-basics-config__content">
+        <BasicsAppearanceSection />
+        <BasicsLoggingSection />
+        <BasicsTerminalSection />
+      </ConfigPageContent>
+    </ConfigPageLayout>
+  );
+};
+
+export default BasicsConfig;
diff --git a/src/web-ui/src/infrastructure/config/components/DebugConfig.scss b/src/web-ui/src/infrastructure/config/components/DebugConfig.scss
index 55d30ec7..d10389cb 100644
--- a/src/web-ui/src/infrastructure/config/components/DebugConfig.scss
+++ b/src/web-ui/src/infrastructure/config/components/DebugConfig.scss
@@ -35,14 +35,59 @@
     width: 100%;
   }
 
-  &__templates-list {
-    border-top: 1px solid var(--border-subtle);
-    padding: $size-gap-3;
+  /** Modal header reset: match `.modal__close` size + hover/active */
+  &__modal-reset-icon.icon-btn {
+    width: 22px !important;
+    height: 22px !important;
+    min-width: 22px;
+    min-height: 22px;
+    padding: 0 !important;
+    border: 1px solid transparent;
+    border-radius: 6px;
+    box-shadow: none;
+    background: transparent;
+    color: var(--color-text-muted);
+    transition: all 0.2s ease;
+
+    svg {
+      width: 12px !important;
+      height: 12px !important;
+    }
+
+    &:hover:not(:disabled) {
+      background: var(--element-bg-subtle);
+      border-color: var(--border-subtle);
+      color: var(--color-text-primary);
+    }
+
+    &:active:not(:disabled) {
+      transform: scale(0.92);
+    }
+
+    &:focus-visible {
+      outline: 2px solid var(--color-accent-500);
+      outline-offset: 2px;
+    }
+  }
+
+  &__modal-body {
+    padding: $size-gap-4;
     display: flex;
     flex-direction: column;
     gap: $size-gap-2;
   }
 
+  &__modal-footer {
+    position: sticky;
+    bottom: 0;
+    display: flex;
+    justify-content: flex-end;
+    gap: $size-gap-2;
+    padding: $size-gap-3 $size-gap-4;
+    border-top: 1px solid var(--border-subtle);
+    background: var(--color-bg-primary);
+  }
+
   &__template-card {
     overflow: hidden;
 
@@ -138,11 +183,11 @@
       justify-content: flex-start;
       flex-wrap: wrap;
     }
+  }
+}
 
-    &__templates-list {
-      padding: $size-gap-2;
-    }
-
+@media (max-width: 520px) {
+  .bitfun-debug-config {
     &__template-content {
       padding: $size-gap-3;
     }
@@ -150,5 +195,9 @@
     &__region-inputs {
       grid-template-columns: 1fr;
     }
+
+    &__modal-body {
+      padding: $size-gap-2 $size-gap-3;
+    }
   }
 }
diff --git a/src/web-ui/src/infrastructure/config/components/DebugConfig.tsx b/src/web-ui/src/infrastructure/config/components/DebugConfig.tsx
deleted file mode 100644
index 5096bee0..00000000
--- a/src/web-ui/src/infrastructure/config/components/DebugConfig.tsx
+++ /dev/null
@@ -1,397 +0,0 @@
- 
-
-import React, { useState, useEffect, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { FolderOpen, RefreshCw, ChevronDown } from 'lucide-react';
-import {
-  Button,
-  NumberInput,
-  Input,
-  Switch,
-  Textarea,
-  Card,
-  CardBody,
-  IconButton,
-  ConfigPageLoading,
-  ConfigPageMessage,
-} from '@/component-library';
-import { ConfigPageHeader, ConfigPageLayout, ConfigPageContent, ConfigPageSection, ConfigPageRow } from './common';
-import { open } from '@tauri-apps/plugin-dialog';
-import { configManager } from '../services/ConfigManager';
-import type { DebugModeConfig, LanguageDebugTemplate } from '../types';
-import { 
-  LANGUAGE_TEMPLATE_LABELS, 
-  DEFAULT_DEBUG_MODE_CONFIG,
-  ALL_LANGUAGES,
-  DEFAULT_LANGUAGE_TEMPLATES,
-} from '../types';
-import { createLogger } from '@/shared/utils/logger';
-import './DebugConfig.scss';
-
-const log = createLogger('DebugConfig');
-
-const DebugConfig: React.FC = () => {
-  const { t } = useTranslation('settings/debug');
-  const [config, setConfig] = useState<DebugModeConfig>(DEFAULT_DEBUG_MODE_CONFIG);
-  const [hasChanges, setHasChanges] = useState(false);
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
-  const [message, setMessage] = useState<{ type: 'success' | 'error' | 'info'; text: string } | null>(null);
-  const [expandedTemplates, setExpandedTemplates] = useState<Set<string>>(new Set());
-
-  
-  useEffect(() => {
-    loadConfig();
-  }, []);
-
-  const loadConfig = async () => {
-    try {
-      setLoading(true);
-      const debugConfig = await configManager.getConfig<DebugModeConfig>('ai.debug_mode_config');
-      if (debugConfig) {
-        setConfig(debugConfig);
-      }
-    } catch (error) {
-      log.error('Failed to load config', error);
-      showMessage('error', t('messages.loadFailed'));
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const saveConfig = async () => {
-    try {
-      setSaving(true);
-      await configManager.setConfig('ai.debug_mode_config', config);
-      setHasChanges(false);
-      showMessage('success', t('messages.saveSuccess'));
-    } catch (error) {
-      log.error('Failed to save config', error);
-      showMessage('error', t('messages.saveFailed'));
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const resetConfig = async () => {
-    try {
-      
-      await configManager.resetConfig('ai.debug_mode_config');
-      await loadConfig();
-      setHasChanges(false);
-      showMessage('success', t('messages.resetSuccess'));
-    } catch (error) {
-      log.error('Failed to reset config', error);
-      showMessage('error', t('messages.resetFailed'));
-    }
-  };
-
-  const updateConfig = useCallback((updates: Partial<DebugModeConfig>) => {
-    setConfig(prev => ({ ...prev, ...updates }));
-    setHasChanges(true);
-  }, []);
-
-  const updateTemplate = useCallback((language: string, updates: Partial<LanguageDebugTemplate>) => {
-    setConfig(prev => ({
-      ...prev,
-      language_templates: {
-        ...prev.language_templates,
-        [language]: {
-          ...prev.language_templates[language],
-          ...updates
-        }
-      }
-    }));
-    setHasChanges(true);
-  }, []);
-
-  
-  const toggleTemplateEnabled = useCallback(async (language: string, currentEnabled: boolean) => {
-    const newEnabled = !currentEnabled;
-    
-    
-    const newConfig = {
-      ...config,
-      language_templates: {
-        ...config.language_templates,
-        [language]: {
-          ...config.language_templates[language],
-          enabled: newEnabled
-        }
-      }
-    };
-    setConfig(newConfig);
-    
-    
-    try {
-      await configManager.setConfig('ai.debug_mode_config', newConfig);
-      const templateName = config.language_templates[language]?.display_name || language;
-      showMessage('success', newEnabled ? t('messages.templateEnabled', { name: templateName }) : t('messages.templateDisabled', { name: templateName }));
-    } catch (error) {
-      log.error('Failed to save template toggle', { language, error });
-      
-      setConfig(config);
-      showMessage('error', t('messages.saveFailed'));
-    }
-  }, [config, t]);
-
-  const showMessage = (type: 'success' | 'error' | 'info', text: string) => {
-    setMessage({ type, text });
-    setTimeout(() => setMessage(null), 3000);
-  };
-
-  const toggleTemplate = (language: string) => {
-    setExpandedTemplates(prev => {
-      const next = new Set(prev);
-      if (next.has(language)) {
-        next.delete(language);
-      } else {
-        next.add(language);
-      }
-      return next;
-    });
-  };
-
-  
-  const handleSelectLogPath = async () => {
-    try {
-      const selected = await open({
-        multiple: false,
-        directory: false,
-        filters: [{
-          name: t('fileDialog.logFile'),
-          extensions: ['log', 'txt', 'ndjson']
-        }]
-      });
-
-      if (selected) {
-        updateConfig({ log_path: selected });
-        showMessage('success', t('messages.logPathUpdated'));
-      }
-    } catch (error) {
-      showMessage('error', `${t('messages.selectFileFailed')}: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  };
-
-  
-  const getTemplateEntries = useCallback((): [string, LanguageDebugTemplate][] => {
-    const entries: [string, LanguageDebugTemplate][] = [];
-    
-    for (const lang of ALL_LANGUAGES) {
-      const userTemplate = config.language_templates?.[lang];
-      const defaultTemplate = DEFAULT_LANGUAGE_TEMPLATES[lang];
-      
-      const template = userTemplate || defaultTemplate;
-      if (template) {
-        entries.push([lang, template]);
-      }
-    }
-    
-    return entries;
-  }, [config.language_templates]);
-
-  const templateEntries = getTemplateEntries();
-
-  if (loading) {
-    return (
-      <ConfigPageLayout className="bitfun-debug-config">
-        <ConfigPageHeader
-          title={t('title')}
-          subtitle={t('subtitle')}
-        />
-        <ConfigPageContent>
-          <ConfigPageLoading text={t('messages.loading')} />
-        </ConfigPageContent>
-      </ConfigPageLayout>
-    );
-  }
-
-  return (
-    <ConfigPageLayout className="bitfun-debug-config">
-      <ConfigPageHeader
-        title={t('title')}
-        subtitle={t('subtitle')}
-      />
-      
-      <ConfigPageContent className="bitfun-debug-config__content">
-        
-        <ConfigPageMessage message={message} />
-
-        
-        <ConfigPageSection
-          title={t('sections.settings')}
-          description={t('subtitle')}
-        >
-          <ConfigPageRow
-            label={t('settings.logPath.label')}
-            description={t('settings.logPath.description')}
-          >
-            <div className="bitfun-debug-config__input-group">
-              <Input
-                value={config.log_path}
-                onChange={(e) => updateConfig({ log_path: e.target.value })}
-                placeholder={t('settings.logPath.placeholder')}
-                variant="outlined"
-                inputSize="small"
-              />
-              <IconButton
-                variant="default"
-                size="small"
-                onClick={handleSelectLogPath}
-                tooltip={t('settings.logPath.browse')}
-              >
-                <FolderOpen size={16} />
-              </IconButton>
-            </div>
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={t('settings.ingestPort.label')}
-            description={t('settings.ingestPort.description')}
-            align="center"
-          >
-            <NumberInput
-              value={config.ingest_port}
-              onChange={(v) => updateConfig({ ingest_port: v })}
-              min={1024}
-              max={65535}
-              step={1}
-              size="small"
-            />
-          </ConfigPageRow>
-
-          {hasChanges && (
-            <ConfigPageRow
-              label={t('actions.save')}
-              align="center"
-            >
-              <div className="bitfun-debug-config__settings-actions">
-                <Button
-                  variant="primary"
-                  size="small"
-                  onClick={saveConfig}
-                  disabled={saving}
-                >
-                  {saving ? t('actions.saving') : t('actions.save')}
-                </Button>
-                <Button
-                  variant="secondary"
-                  size="small"
-                  onClick={loadConfig}
-                  disabled={saving}
-                >
-                  {t('actions.cancel')}
-                </Button>
-              </div>
-            </ConfigPageRow>
-          )}
-        </ConfigPageSection>
-
-        <ConfigPageSection
-          title={t('sections.templates')}
-          description={t('templates.description')}
-          extra={(
-            <Button
-              variant="secondary"
-              size="small"
-              onClick={resetConfig}
-            >
-              <RefreshCw size={14} />
-              {t('templates.reset')}
-            </Button>
-          )}
-        >
-          <div className="bitfun-debug-config__templates-list">
-            {templateEntries.map(([language, template]) => {
-              const isExpanded = expandedTemplates.has(language);
-              return (
-                <Card
-                  key={language}
-                  variant="default"
-                  padding="none"
-                  interactive
-                  className={`bitfun-debug-config__template-card ${isExpanded ? 'is-expanded' : ''}`}
-                >
-                  <div
-                    className="bitfun-debug-config__template-header"
-                    onClick={() => toggleTemplate(language)}
-                  >
-                    <div className="bitfun-debug-config__template-info">
-                      <div onClick={(e) => e.stopPropagation()}>
-                        <Switch
-                          checked={template.enabled}
-                          onChange={() => toggleTemplateEnabled(language, template.enabled)}
-                          size="small"
-                        />
-                      </div>
-                      <span className="bitfun-debug-config__template-name">
-                        {template.display_name || LANGUAGE_TEMPLATE_LABELS[language] || language}
-                      </span>
-                    </div>
-                    <ChevronDown
-                      size={16}
-                      className={`bitfun-debug-config__template-arrow ${isExpanded ? 'is-expanded' : ''}`}
-                    />
-                  </div>
-
-                  {isExpanded && (
-                    <CardBody className="bitfun-debug-config__template-content">
-                      <div className="bitfun-debug-config__template-field">
-                        <Textarea
-                          label={t('templates.instrumentation.label')}
-                          value={template.instrumentation_template}
-                          onChange={(e) => updateTemplate(language, { instrumentation_template: e.target.value })}
-                          placeholder={t('templates.instrumentation.placeholder')}
-                          hint={`${t('templates.instrumentation.placeholders')}: {LOCATION}, {MESSAGE}, {DATA}, {PORT}, {SESSION_ID}, {HYPOTHESIS_ID}, {RUN_ID}, {LOG_PATH}`}
-                          variant="outlined"
-                          autoResize
-                        />
-                      </div>
-                      <div className="bitfun-debug-config__template-field">
-                        <label className="bitfun-debug-config__template-label">
-                          {t('templates.region.label')}
-                        </label>
-                        <div className="bitfun-debug-config__region-inputs">
-                          <Input
-                            value={template.region_start}
-                            onChange={(e) => updateTemplate(language, { region_start: e.target.value })}
-                            placeholder={t('templates.region.startPlaceholder')}
-                            variant="outlined"
-                            inputSize="small"
-                          />
-                          <Input
-                            value={template.region_end}
-                            onChange={(e) => updateTemplate(language, { region_end: e.target.value })}
-                            placeholder={t('templates.region.endPlaceholder')}
-                            variant="outlined"
-                            inputSize="small"
-                          />
-                        </div>
-                      </div>
-                      {template.notes && template.notes.length > 0 && (
-                        <div className="bitfun-debug-config__template-field">
-                          <label className="bitfun-debug-config__template-label">
-                            {t('templates.notes')}
-                          </label>
-                          <div className="bitfun-debug-config__template-notes">
-                            {template.notes.map((note, idx) => (
-                              <span key={idx} className="bitfun-debug-config__template-note">
-                                {note}
-                              </span>
-                            ))}
-                          </div>
-                        </div>
-                      )}
-                    </CardBody>
-                  )}
-                </Card>
-              );
-            })}
-          </div>
-        </ConfigPageSection>
-      </ConfigPageContent>
-    </ConfigPageLayout>
-  );
-};
-
-export default DebugConfig;
diff --git a/src/web-ui/src/infrastructure/config/components/LoggingConfig.scss b/src/web-ui/src/infrastructure/config/components/LoggingConfig.scss
deleted file mode 100644
index 371acfcc..00000000
--- a/src/web-ui/src/infrastructure/config/components/LoggingConfig.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-.bitfun-logging-config {
-  &__content {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-  }
-
-  &__select-wrapper {
-    width: 100%;
-  }
-
-  &__path-row {
-    display: flex;
-    align-items: stretch;
-    gap: 8px;
-    width: 100%;
-
-    .bitfun-logging-config__path-box {
-      flex: 1;
-      min-width: 0;
-    }
-  }
-
-  &__open-btn {
-    flex-shrink: 0;
-    align-self: stretch;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 36px;
-    min-width: 36px;
-    padding: 0;
-    border: 1px solid transparent;
-    border-radius: 6px;
-    background: transparent;
-    color: var(--color-text-secondary);
-    cursor: pointer;
-    transition: background 0.15s, color 0.15s, border-color 0.15s;
-
-    &:hover:not(:disabled) {
-      background: var(--element-bg-base, rgba(255, 255, 255, 0.08));
-      border-color: var(--border-subtle);
-      color: var(--color-text-primary);
-    }
-
-    &:active:not(:disabled) {
-      background: var(--element-bg-medium, rgba(255, 255, 255, 0.14));
-    }
-
-    &:disabled {
-      opacity: 0.4;
-      cursor: not-allowed;
-    }
-  }
-
-  &__path-box {
-    width: 100%;
-    padding: 10px 12px;
-    border-radius: 6px;
-    background: transparent;
-    border: 1px dashed var(--border-base);
-    color: var(--color-text-primary);
-    font-family: var(--font-family-mono, Consolas, "Courier New", monospace);
-    font-size: 12px;
-    word-break: break-all;
-    overflow-wrap: anywhere;
-    line-height: 1.6;
-    user-select: text;
-  }
-}
diff --git a/src/web-ui/src/infrastructure/config/components/LoggingConfig.tsx b/src/web-ui/src/infrastructure/config/components/LoggingConfig.tsx
deleted file mode 100644
index ff7184ae..00000000
--- a/src/web-ui/src/infrastructure/config/components/LoggingConfig.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { FolderOpen } from 'lucide-react';
-import {
-  Select,
-  Tooltip,
-  ConfigPageLoading,
-  ConfigPageMessage,
-  ConfigPageRefreshButton,
-} from '@/component-library';
-import { configAPI, workspaceAPI } from '@/infrastructure/api';
-import { ConfigPageContent, ConfigPageHeader, ConfigPageLayout, ConfigPageSection, ConfigPageRow } from './common';
-import { configManager } from '../services/ConfigManager';
-import { createLogger } from '@/shared/utils/logger';
-import type { BackendLogLevel, RuntimeLoggingInfo } from '../types';
-import './LoggingConfig.scss';
-
-const log = createLogger('LoggingConfig');
-
-const LoggingConfig: React.FC = () => {
-  const { t } = useTranslation('settings/logging');
-  const [configLevel, setConfigLevel] = useState<BackendLogLevel>('info');
-  const [runtimeInfo, setRuntimeInfo] = useState<RuntimeLoggingInfo | null>(null);
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
-  const [openingFolder, setOpeningFolder] = useState(false);
-  const [message, setMessage] = useState<{ type: 'success' | 'error' | 'info'; text: string } | null>(null);
-
-  const levelOptions = useMemo(
-    () => [
-      { value: 'trace', label: t('levels.trace') },
-      { value: 'debug', label: t('levels.debug') },
-      { value: 'info', label: t('levels.info') },
-      { value: 'warn', label: t('levels.warn') },
-      { value: 'error', label: t('levels.error') },
-      { value: 'off', label: t('levels.off') },
-    ],
-    [t]
-  );
-
-  const showMessage = useCallback((type: 'success' | 'error' | 'info', text: string) => {
-    setMessage({ type, text });
-    setTimeout(() => setMessage(null), 3000);
-  }, []);
-
-  const loadData = useCallback(async () => {
-    try {
-      setLoading(true);
-
-      const [savedLevel, info] = await Promise.all([
-        configManager.getConfig<BackendLogLevel>('app.logging.level'),
-        configAPI.getRuntimeLoggingInfo(),
-      ]);
-
-      setConfigLevel(savedLevel || info.effectiveLevel || 'info');
-      setRuntimeInfo(info);
-    } catch (error) {
-      log.error('Failed to load logging config', error);
-      showMessage('error', t('messages.loadFailed'));
-    } finally {
-      setLoading(false);
-    }
-  }, [showMessage, t]);
-
-  useEffect(() => {
-    loadData();
-  }, [loadData]);
-
-  const handleLevelChange = useCallback(async (value: string) => {
-    const nextLevel = value as BackendLogLevel;
-    const previousLevel = configLevel;
-    setConfigLevel(nextLevel);
-    setSaving(true);
-
-    try {
-      await configManager.setConfig('app.logging.level', nextLevel);
-      configManager.clearCache();
-
-      const info = await configAPI.getRuntimeLoggingInfo();
-      setRuntimeInfo(info);
-      showMessage('success', t('messages.levelUpdated'));
-    } catch (error) {
-      setConfigLevel(previousLevel);
-      log.error('Failed to update logging level', { nextLevel, error });
-      showMessage('error', t('messages.saveFailed'));
-    } finally {
-      setSaving(false);
-    }
-  }, [configLevel, showMessage, t]);
-
-  const handleRefresh = useCallback(async () => {
-    await loadData();
-    showMessage('info', t('messages.refreshed'));
-  }, [loadData, showMessage, t]);
-
-  const handleOpenFolder = useCallback(async () => {
-    const folder = runtimeInfo?.sessionLogDir;
-    if (!folder) {
-      showMessage('error', t('messages.pathUnavailable'));
-      return;
-    }
-
-    try {
-      setOpeningFolder(true);
-      await workspaceAPI.revealInExplorer(folder);
-    } catch (error) {
-      log.error('Failed to open log folder', { folder, error });
-      showMessage('error', t('messages.openFailed'));
-    } finally {
-      setOpeningFolder(false);
-    }
-  }, [runtimeInfo?.sessionLogDir, showMessage, t]);
-
-  if (loading) {
-    return (
-      <ConfigPageLayout className="bitfun-logging-config">
-        <ConfigPageHeader title={t('title')} subtitle={t('subtitle')} />
-        <ConfigPageContent>
-          <ConfigPageLoading text={t('messages.loading')} />
-        </ConfigPageContent>
-      </ConfigPageLayout>
-    );
-  }
-
-  return (
-    <ConfigPageLayout className="bitfun-logging-config">
-      <ConfigPageHeader title={t('title')} subtitle={t('subtitle')} />
-      <ConfigPageContent className="bitfun-logging-config__content">
-        <ConfigPageMessage message={message} />
-
-        <ConfigPageSection
-          title={t('sections.level')}
-          extra={(
-            <ConfigPageRefreshButton
-              tooltip={t('actions.refreshTooltip')}
-              onClick={handleRefresh}
-              loading={loading}
-              disabled={loading || saving}
-            />
-          )}
-        >
-          <ConfigPageRow
-            label={t('sections.level')}
-            description={t('level.description')}
-            align="center"
-          >
-            <div className="bitfun-logging-config__select-wrapper">
-              <Select
-                value={configLevel}
-                onChange={(v) => handleLevelChange(v as string)}
-                options={levelOptions}
-                disabled={saving}
-              />
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-
-        <ConfigPageSection title={t('sections.path')}>
-          <ConfigPageRow
-            label={t('sections.path')}
-            description={t('subtitle')}
-            multiline
-          >
-            <div className="bitfun-logging-config__path-row">
-              <div className="bitfun-logging-config__path-box">
-                {runtimeInfo?.sessionLogDir || '-'}
-              </div>
-              <Tooltip content={t('actions.openFolderTooltip')} placement="top">
-                <button
-                  className="bitfun-logging-config__open-btn"
-                  onClick={handleOpenFolder}
-                  disabled={openingFolder || !runtimeInfo?.sessionLogDir}
-                >
-                  <FolderOpen size={14} />
-                </button>
-              </Tooltip>
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-      </ConfigPageContent>
-    </ConfigPageLayout>
-  );
-};
-
-export default LoggingConfig;
diff --git a/src/web-ui/src/infrastructure/config/components/McpToolsConfig.scss b/src/web-ui/src/infrastructure/config/components/McpToolsConfig.scss
index 8aecc2f2..92899941 100644
--- a/src/web-ui/src/infrastructure/config/components/McpToolsConfig.scss
+++ b/src/web-ui/src/infrastructure/config/components/McpToolsConfig.scss
@@ -152,75 +152,4 @@
     color: var(--color-text-secondary);
     word-break: break-all;
   }
-
-  // ─── Tools badges & properties ──────────────────────────────────────────────
-  &__badge {
-    display: inline-flex;
-    align-items: center;
-    flex-shrink: 0;
-    padding: 1px 7px;
-    border-radius: $size-radius-sm;
-    font-size: $font-size-xs;
-    font-weight: $font-weight-medium;
-    white-space: nowrap;
-
-    &--readonly {
-      background: rgba(#60a5fa, 0.12);
-      color: #60a5fa;
-    }
-
-    &--writable {
-      background: rgba(#f87171, 0.12);
-      color: #f87171;
-    }
-
-    &--concurrent {
-      background: rgba(#34d399, 0.12);
-      color: #34d399;
-    }
-
-    &--permission {
-      background: rgba(#fbbf24, 0.12);
-      color: #fbbf24;
-    }
-  }
-
-  &__properties {
-    display: flex;
-    flex-wrap: wrap;
-    gap: $size-gap-3;
-  }
-
-  &__property {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    font-size: $font-size-xs;
-    color: var(--color-text-secondary);
-  }
-
-  &__icon-check {
-    color: var(--color-success);
-    flex-shrink: 0;
-  }
-
-  &__icon-cross {
-    color: var(--color-text-muted);
-    flex-shrink: 0;
-  }
-
-  &__retry-btn {
-    padding: 4px 12px;
-    border-radius: $size-radius-base;
-    border: 1px solid var(--border-base);
-    background: var(--element-bg-medium);
-    color: var(--color-text-secondary);
-    font-size: $font-size-sm;
-    cursor: pointer;
-    transition: background $motion-base $easing-standard;
-
-    &:hover {
-      background: var(--element-bg-strong);
-    }
-  }
 }
diff --git a/src/web-ui/src/infrastructure/config/components/McpToolsConfig.tsx b/src/web-ui/src/infrastructure/config/components/McpToolsConfig.tsx
index 8bcb24a5..9f55435f 100644
--- a/src/web-ui/src/infrastructure/config/components/McpToolsConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/McpToolsConfig.tsx
@@ -1,6 +1,7 @@
 /**
- * McpToolsConfig — single settings page combining MCP servers and Tools (execution + list).
- * Uses settings/mcp-tools for page title/subtitle, settings/mcp for MCP section, settings/agentic-tools for Tools section.
+ * McpToolsConfig — MCP servers only.
+ * Tool execution behavior lives on Session Config.
+ * Uses settings/mcp-tools for page title/subtitle, settings/mcp for the MCP section.
  */
 
 import React, { useRef, useState, useEffect } from 'react';
@@ -15,36 +16,22 @@ import {
   Clock,
   AlertTriangle,
   MinusCircle,
-  XCircle,
 } from 'lucide-react';
-import { Button, Textarea, IconButton, Switch, NumberInput } from '@/component-library';
+import { Button, Textarea, IconButton } from '@/component-library';
 import {
   ConfigPageHeader,
   ConfigPageLayout,
   ConfigPageContent,
   ConfigPageSection,
-  ConfigPageRow,
   ConfigCollectionItem,
 } from './common';
-import { useNotification, notificationService } from '@/shared/notification-system';
+import { useNotification } from '@/shared/notification-system';
 import { createLogger } from '@/shared/utils/logger';
 import { MCPAPI, MCPServerInfo } from '../../api/service-api/MCPAPI';
-import { toolAPI } from '../../api/service-api/ToolAPI';
-import { configManager } from '../services/ConfigManager';
 import './McpToolsConfig.scss';
 
 const log = createLogger('McpToolsConfig');
 
-// ─── Tool types (from AgenticToolsConfig) ───────────────────────────────────
-interface ToolInfo {
-  name: string;
-  description: string;
-  input_schema: any;
-  is_readonly: boolean;
-  is_concurrency_safe: boolean;
-  needs_permissions: boolean;
-}
-
 // ─── MCP error classifier (from MCPConfig) ────────────────────────────────────
 interface ErrorInfo {
   title: string;
@@ -152,7 +139,6 @@ function createErrorClassifier(t: (key: string, options?: any) => any) {
 const McpToolsConfig: React.FC = () => {
   const { t: tPage } = useTranslation('settings/mcp-tools');
   const { t: tMcp } = useTranslation('settings/mcp');
-  const { t: tTools } = useTranslation('settings/agentic-tools');
 
   const notification = useNotification();
   const classifyError = createErrorClassifier(tMcp);
@@ -171,16 +157,6 @@ const McpToolsConfig: React.FC = () => {
     position?: number;
   } | null>(null);
 
-  // ─── Tools state ────────────────────────────────────────────────────────────
-  const [tools, setTools] = useState<ToolInfo[]>([]);
-  const [toolsLoading, setToolsLoading] = useState(true);
-  const [toolsError, setToolsError] = useState<string | null>(null);
-  const [expandedToolNames, setExpandedToolNames] = useState<Set<string>>(new Set());
-  const [skipToolConfirmation, setSkipToolConfirmation] = useState(false);
-  const [executionTimeout, setExecutionTimeout] = useState('');
-  const [confirmationTimeout, setConfirmationTimeout] = useState('');
-  const [configLoading, setConfigLoading] = useState(false);
-
   const tryFormatJson = (input: string): string | null => {
     try {
       return JSON.stringify(JSON.parse(input), null, 2);
@@ -532,157 +508,6 @@ const McpToolsConfig: React.FC = () => {
       : tMcp('server.runtime.system', { defaultValue: 'system' });
   };
 
-  // ─── Tools effects & handlers ───────────────────────────────────────────────
-  const loadTools = async () => {
-    try {
-      setToolsLoading(true);
-      setToolsError(null);
-      const toolsData = await toolAPI.getAllToolsInfo();
-      setTools(toolsData);
-    } catch (err) {
-      log.error('Failed to load tools', err);
-      setToolsError(err instanceof Error ? err.message : String(err));
-    } finally {
-      setToolsLoading(false);
-    }
-  };
-
-  const loadToolConfig = async () => {
-    try {
-      const [skipConfirm, execTimeout, confirmTimeout] = await Promise.all([
-        configManager.getConfig<boolean>('ai.skip_tool_confirmation'),
-        configManager.getConfig<number | null>('ai.tool_execution_timeout_secs'),
-        configManager.getConfig<number | null>('ai.tool_confirmation_timeout_secs'),
-      ]);
-      setSkipToolConfirmation(skipConfirm || false);
-      setExecutionTimeout(execTimeout != null ? String(execTimeout) : '');
-      setConfirmationTimeout(confirmTimeout != null ? String(confirmTimeout) : '');
-    } catch (err) {
-      log.error('Failed to load config', err);
-    }
-  };
-
-  useEffect(() => {
-    loadTools();
-    loadToolConfig();
-  }, []);
-
-  const handleSkipConfirmationChange = async (checked: boolean) => {
-    setSkipToolConfirmation(checked);
-    setConfigLoading(true);
-    try {
-      await configManager.setConfig('ai.skip_tool_confirmation', checked);
-      notificationService.success(
-        checked ? tTools('messages.autoExecuteEnabled') : tTools('messages.autoExecuteDisabled'),
-        { duration: 2000 }
-      );
-      const { globalEventBus } = await import('@/infrastructure/event-bus');
-      globalEventBus.emit('mode:config:updated');
-    } catch (err) {
-      log.error('Failed to save config', err);
-      notificationService.error(
-        `${tTools('messages.saveFailed')}: ` + (err instanceof Error ? err.message : String(err))
-      );
-      setSkipToolConfirmation(!checked);
-    } finally {
-      setConfigLoading(false);
-    }
-  };
-
-  const handleTimeoutChange = async (type: 'execution' | 'confirmation', value: string) => {
-    const configKey =
-      type === 'execution' ? 'ai.tool_execution_timeout_secs' : 'ai.tool_confirmation_timeout_secs';
-    const trimmedValue = value.trim();
-    if (trimmedValue !== '') {
-      const numValue = parseInt(trimmedValue, 10);
-      if (isNaN(numValue) || numValue < 0) return;
-    }
-    if (type === 'execution') setExecutionTimeout(trimmedValue);
-    else setConfirmationTimeout(trimmedValue);
-    const numValue = trimmedValue === '' ? null : parseInt(trimmedValue, 10);
-    try {
-      await configManager.setConfig(configKey, numValue);
-    } catch (err) {
-      log.error('Failed to save timeout config', { type, error: err });
-      notificationService.error(tTools('messages.saveFailed'));
-    }
-  };
-
-  const toggleToolExpanded = (toolName: string) => {
-    setExpandedToolNames((prev) => {
-      const next = new Set(prev);
-      if (next.has(toolName)) next.delete(toolName);
-      else next.add(toolName);
-      return next;
-    });
-  };
-
-  const formatSchema = (schema: any): string => {
-    try {
-      return JSON.stringify(schema, null, 2);
-    } catch {
-      return String(schema);
-    }
-  };
-
-  const renderToolBadge = (tool: ToolInfo) => (
-    <>
-      <span
-        className={`bitfun-mcp-tools__badge bitfun-mcp-tools__badge--${
-          tool.is_readonly ? 'readonly' : 'writable'
-        }`}
-      >
-        {tool.is_readonly ? tTools('badges.readonly') : tTools('badges.writable')}
-      </span>
-      {tool.is_concurrency_safe && (
-        <span className="bitfun-mcp-tools__badge bitfun-mcp-tools__badge--concurrent">
-          {tTools('badges.concurrent')}
-        </span>
-      )}
-      {tool.needs_permissions && (
-        <span className="bitfun-mcp-tools__badge bitfun-mcp-tools__badge--permission">
-          {tTools('badges.permission')}
-        </span>
-      )}
-    </>
-  );
-
-  const renderToolDetails = (tool: ToolInfo) => (
-    <>
-      <div className="bitfun-collection-details__field">{tool.description}</div>
-      <div className="bitfun-mcp-tools__properties">
-        <span className="bitfun-mcp-tools__property">
-          {tool.is_readonly ? (
-            <CheckCircle size={12} className="bitfun-mcp-tools__icon-check" />
-          ) : (
-            <XCircle size={12} className="bitfun-mcp-tools__icon-cross" />
-          )}
-          {tTools('properties.readonlyMode')}
-        </span>
-        <span className="bitfun-mcp-tools__property">
-          {tool.is_concurrency_safe ? (
-            <CheckCircle size={12} className="bitfun-mcp-tools__icon-check" />
-          ) : (
-            <XCircle size={12} className="bitfun-mcp-tools__icon-cross" />
-          )}
-          {tTools('properties.concurrencySafe')}
-        </span>
-        <span className="bitfun-mcp-tools__property">
-          {tool.needs_permissions ? (
-            <CheckCircle size={12} className="bitfun-mcp-tools__icon-check" />
-          ) : (
-            <XCircle size={12} className="bitfun-mcp-tools__icon-cross" />
-          )}
-          {tTools('properties.needsPermission')}
-        </span>
-      </div>
-      <div>
-        <div className="bitfun-collection-details__label">{tTools('schema.title')}</div>
-        <pre className="bitfun-collection-details__pre">{formatSchema(tool.input_schema)}</pre>
-      </div>
-    </>
-  );
-
   const mcpSectionExtra = (
     <>
       <IconButton
@@ -808,57 +633,6 @@ const McpToolsConfig: React.FC = () => {
       <ConfigPageHeader title={tPage('title')} subtitle={tPage('subtitle')} />
 
       <ConfigPageContent>
-        <ConfigPageSection
-          title={tTools('section.config.title')}
-          description={tTools('section.config.description')}
-        >
-          <ConfigPageRow
-            label={tTools('config.autoExecute')}
-            description={tTools('config.autoExecuteDesc')}
-          >
-            <Switch
-              checked={skipToolConfirmation}
-              onChange={(e) => handleSkipConfirmationChange(e.target.checked)}
-              disabled={configLoading}
-              size="medium"
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={tTools('config.confirmTimeout')}
-            description={tTools('config.confirmTimeoutDesc')}
-          >
-            <NumberInput
-              value={confirmationTimeout === '' ? 0 : parseInt(confirmationTimeout, 10)}
-              onChange={(val) =>
-                handleTimeoutChange('confirmation', val === 0 ? '' : String(val))
-              }
-              min={0}
-              max={3600}
-              step={5}
-              unit={tTools('config.seconds')}
-              size="small"
-              variant="compact"
-            />
-          </ConfigPageRow>
-
-          <ConfigPageRow
-            label={tTools('config.executionTimeout')}
-            description={tTools('config.executionTimeoutDesc')}
-          >
-            <NumberInput
-              value={executionTimeout === '' ? 0 : parseInt(executionTimeout, 10)}
-              onChange={(val) => handleTimeoutChange('execution', val === 0 ? '' : String(val))}
-              min={0}
-              max={3600}
-              step={5}
-              unit={tTools('config.seconds')}
-              size="small"
-              variant="compact"
-            />
-          </ConfigPageRow>
-        </ConfigPageSection>
-
         {/* MCP section */}
         <ConfigPageSection
           title={tMcp('section.serverList.title')}
@@ -947,49 +721,6 @@ const McpToolsConfig: React.FC = () => {
               />
             ))}
         </ConfigPageSection>
-
-        {/* Tools section: list */}
-        <ConfigPageSection
-          title={tTools('section.list.title')}
-          description={tTools('section.list.description', { count: tools.length })}
-        >
-          {toolsLoading && (
-            <div className="bitfun-collection-empty">
-              <p>{tTools('messages.loading')}</p>
-            </div>
-          )}
-
-          {!toolsLoading && toolsError && (
-            <div className="bitfun-collection-empty">
-              <p>
-                {tTools('messages.loadFailed')}: {toolsError}
-              </p>
-              <button className="bitfun-mcp-tools__retry-btn" onClick={loadTools}>
-                {tTools('messages.retry')}
-              </button>
-            </div>
-          )}
-
-          {!toolsLoading && !toolsError && tools.length === 0 && (
-            <div className="bitfun-collection-empty">
-              <p>{tTools('messages.noTools')}</p>
-            </div>
-          )}
-
-          {!toolsLoading &&
-            !toolsError &&
-            tools.map((tool) => (
-              <ConfigCollectionItem
-                key={tool.name}
-                label={tool.name}
-                badge={renderToolBadge(tool)}
-                control={<></>}
-                details={renderToolDetails(tool)}
-                expanded={expandedToolNames.has(tool.name)}
-                onToggle={() => toggleToolExpanded(tool.name)}
-              />
-            ))}
-        </ConfigPageSection>
       </ConfigPageContent>
     </ConfigPageLayout>
   );
diff --git a/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx b/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
index ca6d2776..34ac684b 100644
--- a/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
+++ b/src/web-ui/src/infrastructure/config/components/SessionConfig.tsx
@@ -1,43 +1,61 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Switch, ConfigPageLoading } from '@/component-library';
+import { FolderOpen, RefreshCw, ChevronDown } from 'lucide-react';
+import {
+  Switch,
+  NumberInput,
+  Button,
+  Input,
+  Textarea,
+  Card,
+  CardBody,
+  IconButton,
+  ConfigPageLoading,
+  Modal,
+} from '@/component-library';
 import { ConfigPageHeader, ConfigPageLayout, ConfigPageContent, ConfigPageSection, ConfigPageRow } from './common';
-import { aiExperienceConfigService } from '../services/AIExperienceConfigService';
+import { aiExperienceConfigService, type AIExperienceSettings } from '../services/AIExperienceConfigService';
 import { configManager } from '../services/ConfigManager';
 import { useNotification, notificationService } from '@/shared/notification-system';
-import type { AIModelConfig } from '../types';
+import type { AIModelConfig, DebugModeConfig, LanguageDebugTemplate } from '../types';
+import {
+  LANGUAGE_TEMPLATE_LABELS,
+  DEFAULT_DEBUG_MODE_CONFIG,
+  ALL_LANGUAGES,
+  DEFAULT_LANGUAGE_TEMPLATES,
+} from '../types';
 import { ModelSelectionRadio } from './ModelSelectionRadio';
+import { open } from '@tauri-apps/plugin-dialog';
 import { createLogger } from '@/shared/utils/logger';
 import './AIFeaturesConfig.scss';
+import './DebugConfig.scss';
 
 const log = createLogger('SessionConfig');
 
-type DefaultSessionMode = 'code' | 'cowork';
-
-const DEFAULT_MODE_CONFIG_KEY = 'app.session_config.default_mode';
-
-interface AIExperienceSettings {
-  enable_session_title_generation: boolean;
-  enable_welcome_panel_ai_analysis: boolean;
-}
-
-const defaultSettings: AIExperienceSettings = {
-  enable_session_title_generation: true,
-  enable_welcome_panel_ai_analysis: true,
-};
-
-const AGENT_SESSION_TITLE   = 'session-title-func-agent';
-const AGENT_WELCOME_ANALYSIS = 'welcome-panel-func-agent';
+const AGENT_SESSION_TITLE = 'session-title-func-agent';
 
 const SessionConfig: React.FC = () => {
   const { t } = useTranslation('settings/session-config');
+  const { t: tTools } = useTranslation('settings/agentic-tools');
+  const { t: tDebug } = useTranslation('settings/debug');
   const notification = useNotification();
 
+  // ── Session config state ─────────────────────────────────────────────────
   const [isLoading, setIsLoading] = useState(true);
-  const [defaultMode, setDefaultMode] = useState<DefaultSessionMode>('code');
-  const [settings, setSettings] = useState<AIExperienceSettings>(defaultSettings);
+  const [settings, setSettings] = useState<AIExperienceSettings | null>(null);
   const [models, setModels] = useState<AIModelConfig[]>([]);
   const [funcAgentModels, setFuncAgentModels] = useState<Record<string, string>>({});
+  const [skipToolConfirmation, setSkipToolConfirmation] = useState(false);
+  const [executionTimeout, setExecutionTimeout] = useState('');
+  const [confirmationTimeout, setConfirmationTimeout] = useState('');
+  const [toolExecConfigLoading, setToolExecConfigLoading] = useState(false);
+
+  // ── Debug mode config state ──────────────────────────────────────────────
+  const [debugConfig, setDebugConfig] = useState<DebugModeConfig>(DEFAULT_DEBUG_MODE_CONFIG);
+  const [debugHasChanges, setDebugHasChanges] = useState(false);
+  const [debugSaving, setDebugSaving] = useState(false);
+  const [expandedTemplates, setExpandedTemplates] = useState<Set<string>>(new Set());
+  const [isTemplatesModalOpen, setIsTemplatesModalOpen] = useState(false);
 
   useEffect(() => {
     loadAllData();
@@ -47,45 +65,45 @@ const SessionConfig: React.FC = () => {
     setIsLoading(true);
     try {
       const [
-        loadedMode,
         loadedSettings,
         allModels,
         funcAgentModelsData,
+        skipConfirm,
+        execTimeout,
+        confirmTimeout,
+        debugConfigData,
       ] = await Promise.all([
-        configManager.getConfig<DefaultSessionMode>(DEFAULT_MODE_CONFIG_KEY),
         aiExperienceConfigService.getSettingsAsync(),
         configManager.getConfig<AIModelConfig[]>('ai.models') || [],
         configManager.getConfig<Record<string, string>>('ai.func_agent_models') || {},
+        configManager.getConfig<boolean>('ai.skip_tool_confirmation'),
+        configManager.getConfig<number | null>('ai.tool_execution_timeout_secs'),
+        configManager.getConfig<number | null>('ai.tool_confirmation_timeout_secs'),
+        configManager.getConfig<DebugModeConfig>('ai.debug_mode_config'),
       ]);
 
-      setDefaultMode(loadedMode ?? 'code');
       setSettings(loadedSettings);
       setModels(allModels as AIModelConfig[]);
       setFuncAgentModels(funcAgentModelsData as Record<string, string>);
+      setSkipToolConfirmation(skipConfirm || false);
+      setExecutionTimeout(execTimeout != null ? String(execTimeout) : '');
+      setConfirmationTimeout(confirmTimeout != null ? String(confirmTimeout) : '');
+      if (debugConfigData) setDebugConfig(debugConfigData);
     } catch (error) {
       log.error('Failed to load session config data', error);
-      setSettings(defaultSettings);
+      setSettings(await aiExperienceConfigService.getSettingsAsync());
     } finally {
       setIsLoading(false);
     }
   };
 
-  const handleDefaultModeChange = async (mode: DefaultSessionMode) => {
-    setDefaultMode(mode);
-    try {
-      await configManager.setConfig(DEFAULT_MODE_CONFIG_KEY, mode);
-      notification.success(t('messages.saveSuccess'));
-    } catch (error) {
-      log.error('Failed to save default session mode', error);
-      notification.error(t('messages.saveFailed'));
-      setDefaultMode(defaultMode);
-    }
-  };
+  // ── Session config handlers ──────────────────────────────────────────────
 
   const updateSetting = async <K extends keyof AIExperienceSettings>(
     key: K,
     value: AIExperienceSettings[K]
   ) => {
+    if (!settings) return;
     const newSettings = { ...settings, [key]: value };
     setSettings(newSettings);
     try {
@@ -129,11 +147,176 @@ const SessionConfig: React.FC = () => {
     }
   };
 
+  const handleSkipToolConfirmationChange = async (checked: boolean) => {
+    setSkipToolConfirmation(checked);
+    setToolExecConfigLoading(true);
+    try {
+      await configManager.setConfig('ai.skip_tool_confirmation', checked);
+      notificationService.success(
+        checked ? tTools('messages.autoExecuteEnabled') : tTools('messages.autoExecuteDisabled'),
+        { duration: 2000 }
+      );
+      const { globalEventBus } = await import('@/infrastructure/event-bus');
+      globalEventBus.emit('mode:config:updated');
+    } catch (error) {
+      log.error('Failed to save skip_tool_confirmation', error);
+      notificationService.error(
+        `${tTools('messages.saveFailed')}: ` + (error instanceof Error ? error.message : String(error))
+      );
+      setSkipToolConfirmation(!checked);
+    } finally {
+      setToolExecConfigLoading(false);
+    }
+  };
+
+  const handleToolTimeoutChange = async (type: 'execution' | 'confirmation', value: string) => {
+    const configKey =
+      type === 'execution' ? 'ai.tool_execution_timeout_secs' : 'ai.tool_confirmation_timeout_secs';
+    const trimmedValue = value.trim();
+    if (trimmedValue !== '') {
+      const numValue = parseInt(trimmedValue, 10);
+      if (Number.isNaN(numValue) || numValue < 0) return;
+    }
+    if (type === 'execution') setExecutionTimeout(trimmedValue);
+    else setConfirmationTimeout(trimmedValue);
+    const numValue = trimmedValue === '' ? null : parseInt(trimmedValue, 10);
+    try {
+      await configManager.setConfig(configKey, numValue);
+    } catch (error) {
+      log.error('Failed to save tool timeout config', { type, error });
+      notificationService.error(tTools('messages.saveFailed'));
+    }
+  };
+
+  // ── Debug config handlers ────────────────────────────────────────────────
+
+  const updateDebugConfig = useCallback((updates: Partial<DebugModeConfig>) => {
+    setDebugConfig(prev => ({ ...prev, ...updates }));
+    setDebugHasChanges(true);
+  }, []);
+
+  const saveDebugConfig = async () => {
+    try {
+      setDebugSaving(true);
+      await configManager.setConfig('ai.debug_mode_config', debugConfig);
+      setDebugHasChanges(false);
+      notificationService.success(tDebug('messages.saveSuccess'), { duration: 2000 });
+    } catch (error) {
+      log.error('Failed to save debug config', error);
+      notificationService.error(tDebug('messages.saveFailed'));
+    } finally {
+      setDebugSaving(false);
+    }
+  };
+
+  const cancelDebugChanges = async () => {
+    const data = await configManager.getConfig<DebugModeConfig>('ai.debug_mode_config');
+    setDebugConfig(data ?? DEFAULT_DEBUG_MODE_CONFIG);
+    setDebugHasChanges(false);
+  };
+
+  const handleModalSave = async () => {
+    await saveDebugConfig();
+    setIsTemplatesModalOpen(false);
+  };
+
+  const handleModalCancel = async () => {
+    await cancelDebugChanges();
+    setIsTemplatesModalOpen(false);
+  };
+
+  const resetDebugTemplates = async () => {
+    try {
+      await configManager.resetConfig('ai.debug_mode_config');
+      const data = await configManager.getConfig<DebugModeConfig>('ai.debug_mode_config');
+      setDebugConfig(data ?? DEFAULT_DEBUG_MODE_CONFIG);
+      setDebugHasChanges(false);
+      notificationService.success(tDebug('messages.resetSuccess'), { duration: 2000 });
+    } catch (error) {
+      log.error('Failed to reset debug config', error);
+      notificationService.error(tDebug('messages.resetFailed'));
+    }
+  };
+
+  const updateTemplate = useCallback((language: string, updates: Partial<LanguageDebugTemplate>) => {
+    setDebugConfig(prev => ({
+      ...prev,
+      language_templates: {
+        ...prev.language_templates,
+        [language]: { ...prev.language_templates[language], ...updates },
+      },
+    }));
+    setDebugHasChanges(true);
+  }, []);
+
+  const toggleTemplateEnabled = useCallback(async (language: string, currentEnabled: boolean) => {
+    const newEnabled = !currentEnabled;
+    const newConfig = {
+      ...debugConfig,
+      language_templates: {
+        ...debugConfig.language_templates,
+        [language]: { ...debugConfig.language_templates[language], enabled: newEnabled },
+      },
+    };
+    setDebugConfig(newConfig);
+    try {
+      await configManager.setConfig('ai.debug_mode_config', newConfig);
+      const templateName = debugConfig.language_templates[language]?.display_name || language;
+      notificationService.success(
+        newEnabled
+          ? tDebug('messages.templateEnabled', { name: templateName })
+          : tDebug('messages.templateDisabled', { name: templateName }),
+        { duration: 2000 }
+      );
+    } catch (error) {
+      log.error('Failed to save template toggle', { language, error });
+      setDebugConfig(debugConfig);
+      notificationService.error(tDebug('messages.saveFailed'));
+    }
+  }, [debugConfig, tDebug]);
+
+  const toggleTemplateExpand = useCallback((language: string) => {
+    setExpandedTemplates(prev => {
+      const next = new Set(prev);
+      next.has(language) ? next.delete(language) : next.add(language);
+      return next;
+    });
+  }, []);
+
+  const handleSelectLogPath = async () => {
+    try {
+      const selected = await open({
+        multiple: false,
+        directory: false,
+        filters: [{ name: tDebug('fileDialog.logFile'), extensions: ['log', 'txt', 'ndjson'] }],
+      });
+      if (selected) {
+        updateDebugConfig({ log_path: selected });
+        notificationService.success(tDebug('messages.logPathUpdated'), { duration: 2000 });
+      }
+    } catch (error) {
+      notificationService.error(
+        `${tDebug('messages.selectFileFailed')}: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  };
+
+  const getTemplateEntries = useCallback((): [string, LanguageDebugTemplate][] => {
+    const entries: [string, LanguageDebugTemplate][] = [];
+    for (const lang of ALL_LANGUAGES) {
+      const template = debugConfig.language_templates?.[lang] ?? DEFAULT_LANGUAGE_TEMPLATES[lang];
+      if (template) entries.push([lang, template]);
+    }
+    return entries;
+  }, [debugConfig.language_templates]);
+
+  // ── Derived values ───────────────────────────────────────────────────────
+
   const enabledModels = models.filter((m: AIModelConfig) => m.enabled);
-  const sessionTitleModelId   = funcAgentModels[AGENT_SESSION_TITLE]   || 'fast';
-  const welcomeAnalysisModelId = funcAgentModels[AGENT_WELCOME_ANALYSIS] || 'fast';
+  const sessionTitleModelId = funcAgentModels[AGENT_SESSION_TITLE] || 'fast';
+  const templateEntries = getTemplateEntries();
 
-  if (isLoading) {
+  if (isLoading || !settings) {
     return (
       <ConfigPageLayout className="bitfun-func-agent-config">
         <ConfigPageHeader title={t('title')} subtitle={t('subtitle')} />
@@ -150,36 +333,7 @@ const SessionConfig: React.FC = () => {
 
       <ConfigPageContent className="bitfun-func-agent-config__content">
 
-        {/* Default session mode */}
-        <ConfigPageSection
-          title={t('sections.defaultMode.title')}
-          description={t('sections.defaultMode.description')}
-        >
-          <ConfigPageRow label={t('sections.defaultMode.code')} description={t('sections.defaultMode.codeDesc')} align="center">
-            <div className="bitfun-func-agent-config__row-control">
-              <input
-                type="radio"
-                name="default-session-mode"
-                value="code"
-                checked={defaultMode === 'code'}
-                onChange={() => handleDefaultModeChange('code')}
-              />
-            </div>
-          </ConfigPageRow>
-          <ConfigPageRow label={t('sections.defaultMode.cowork')} description={t('sections.defaultMode.coworkDesc')} align="center">
-            <div className="bitfun-func-agent-config__row-control">
-              <input
-                type="radio"
-                name="default-session-mode"
-                value="cowork"
-                checked={defaultMode === 'cowork'}
-                onChange={() => handleDefaultModeChange('cowork')}
-              />
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-
-        {/* Session title auto generation */}
+        {/* ── Auto session title ─────────────────────────────────── */}
         <ConfigPageSection
           title={t('features.sessionTitle.title')}
           description={t('features.sessionTitle.subtitle')}
@@ -211,38 +365,265 @@ const SessionConfig: React.FC = () => {
           </ConfigPageRow>
         </ConfigPageSection>
 
-        {/* Welcome panel AI analysis */}
+        {/* ── Tool execution behavior ────────────────────────────── */}
         <ConfigPageSection
-          title={t('features.welcomeAnalysis.title')}
-          description={t('features.welcomeAnalysis.subtitle')}
+          title={t('toolExecution.sectionTitle')}
+          description={t('toolExecution.sectionDescription')}
         >
-          <ConfigPageRow label={t('common.enable')} align="center">
+          <ConfigPageRow label={tTools('config.autoExecute')} description={tTools('config.autoExecuteDesc')} align="center">
             <div className="bitfun-func-agent-config__row-control">
               <Switch
-                checked={settings.enable_welcome_panel_ai_analysis}
-                onChange={(e) => updateSetting('enable_welcome_panel_ai_analysis', e.target.checked)}
+                checked={skipToolConfirmation}
+                onChange={(e) => handleSkipToolConfirmationChange(e.target.checked)}
+                disabled={toolExecConfigLoading}
                 size="small"
               />
             </div>
           </ConfigPageRow>
+          <ConfigPageRow label={tTools('config.confirmTimeout')} description={tTools('config.confirmTimeoutDesc')} align="center">
+            <div className="bitfun-func-agent-config__row-control">
+              <NumberInput
+                value={confirmationTimeout === '' ? 0 : parseInt(confirmationTimeout, 10)}
+                onChange={(val) => handleToolTimeoutChange('confirmation', val === 0 ? '' : String(val))}
+                min={0}
+                max={3600}
+                step={5}
+                unit={tTools('config.seconds')}
+                size="small"
+                variant="compact"
+              />
+            </div>
+          </ConfigPageRow>
+          <ConfigPageRow label={tTools('config.executionTimeout')} description={tTools('config.executionTimeoutDesc')} align="center">
+            <div className="bitfun-func-agent-config__row-control">
+              <NumberInput
+                value={executionTimeout === '' ? 0 : parseInt(executionTimeout, 10)}
+                onChange={(val) => handleToolTimeoutChange('execution', val === 0 ? '' : String(val))}
+                min={0}
+                max={3600}
+                step={5}
+                unit={tTools('config.seconds')}
+                size="small"
+                variant="compact"
+              />
+            </div>
+          </ConfigPageRow>
+        </ConfigPageSection>
+
+        {/* ── Debug mode settings ───────────────────────────────── */}
+        <ConfigPageSection
+          title={tDebug('sections.combined')}
+          description={tDebug('sections.combinedDescription')}
+        >
+          {/* Basic settings: log path + ingest port */}
           <ConfigPageRow
-            className="bitfun-func-agent-config__model-row"
-            label={t('model.label')}
-            description={enabledModels.length === 0 ? t('models.empty') : undefined}
-            align="center"
+            label={tDebug('settings.logPath.label')}
+            description={tDebug('settings.logPath.description')}
           >
-            <div className="bitfun-func-agent-config__row-control bitfun-func-agent-config__row-control--model">
-              <ModelSelectionRadio
-                value={welcomeAnalysisModelId}
-                models={enabledModels}
-                onChange={(modelId) => handleAgentModelChange(AGENT_WELCOME_ANALYSIS, 'features.welcomeAnalysis.title', modelId)}
-                layout="horizontal"
-                size="small"
+            <div className="bitfun-debug-config__input-group">
+              <Input
+                value={debugConfig.log_path}
+                onChange={(e) => updateDebugConfig({ log_path: e.target.value })}
+                placeholder={tDebug('settings.logPath.placeholder')}
+                variant="outlined"
+                inputSize="small"
               />
+              <IconButton
+                variant="default"
+                size="small"
+                onClick={handleSelectLogPath}
+                tooltip={tDebug('settings.logPath.browse')}
+              >
+                <FolderOpen size={16} />
+              </IconButton>
             </div>
           </ConfigPageRow>
+
+          <ConfigPageRow
+            label={tDebug('settings.ingestPort.label')}
+            description={tDebug('settings.ingestPort.description')}
+            align="center"
+          >
+            <NumberInput
+              value={debugConfig.ingest_port}
+              onChange={(v) => updateDebugConfig({ ingest_port: v })}
+              min={1024}
+              max={65535}
+              step={1}
+              size="small"
+            />
+          </ConfigPageRow>
+
+          {/* Save / cancel for basic settings changes (not shown while modal is open) */}
+          {debugHasChanges && !isTemplatesModalOpen && (
+            <ConfigPageRow label={tDebug('actions.save')} align="center">
+              <div className="bitfun-debug-config__settings-actions">
+                <Button
+                  variant="primary"
+                  size="small"
+                  onClick={saveDebugConfig}
+                  disabled={debugSaving}
+                >
+                  {debugSaving ? tDebug('actions.saving') : tDebug('actions.save')}
+                </Button>
+                <Button
+                  variant="secondary"
+                  size="small"
+                  onClick={cancelDebugChanges}
+                  disabled={debugSaving}
+                >
+                  {tDebug('actions.cancel')}
+                </Button>
+              </div>
+            </ConfigPageRow>
+          )}
+
+          {/* Language templates entry row */}
+          <ConfigPageRow
+            label={tDebug('sections.templates')}
+            description={tDebug('templates.description')}
+            align="center"
+          >
+            <Button
+              variant="secondary"
+              size="small"
+              onClick={() => setIsTemplatesModalOpen(true)}
+            >
+              {tDebug('templates.configure')}
+            </Button>
+          </ConfigPageRow>
         </ConfigPageSection>
 
+        {/* ── Language templates modal ───────────────────────────── */}
+        <Modal
+          isOpen={isTemplatesModalOpen}
+          onClose={() => setIsTemplatesModalOpen(false)}
+          title={tDebug('sections.templates')}
+          titleExtra={(
+            <IconButton
+              type="button"
+              variant="ghost"
+              size="xs"
+              className="bitfun-debug-config__modal-reset-icon"
+              onClick={resetDebugTemplates}
+              tooltip={tDebug('templates.reset')}
+              aria-label={tDebug('templates.reset')}
+            >
+              <RefreshCw size={12} strokeWidth={2} />
+            </IconButton>
+          )}
+          size="large"
+        >
+          <div className="bitfun-debug-config__modal-body">
+            {templateEntries.map(([language, template]) => {
+              const isExpanded = expandedTemplates.has(language);
+              return (
+                <Card
+                  key={language}
+                  variant="default"
+                  padding="none"
+                  interactive
+                  className={`bitfun-debug-config__template-card${isExpanded ? ' is-expanded' : ''}`}
+                >
+                  <div
+                    className="bitfun-debug-config__template-header"
+                    onClick={() => toggleTemplateExpand(language)}
+                  >
+                    <div className="bitfun-debug-config__template-info">
+                      <div onClick={(e) => e.stopPropagation()}>
+                        <Switch
+                          checked={template.enabled}
+                          onChange={() => toggleTemplateEnabled(language, template.enabled)}
+                          size="small"
+                        />
+                      </div>
+                      <span className="bitfun-debug-config__template-name">
+                        {template.display_name || LANGUAGE_TEMPLATE_LABELS[language] || language}
+                      </span>
+                    </div>
+                    <ChevronDown
+                      size={16}
+                      className={`bitfun-debug-config__template-arrow${isExpanded ? ' is-expanded' : ''}`}
+                    />
+                  </div>
+
+                  {isExpanded && (
+                    <CardBody className="bitfun-debug-config__template-content">
+                      <div className="bitfun-debug-config__template-field">
+                        <Textarea
+                          label={tDebug('templates.instrumentation.label')}
+                          value={template.instrumentation_template}
+                          onChange={(e) => updateTemplate(language, { instrumentation_template: e.target.value })}
+                          placeholder={tDebug('templates.instrumentation.placeholder')}
+                          hint={`${tDebug('templates.instrumentation.placeholders')}: {LOCATION}, {MESSAGE}, {DATA}, {PORT}, {SESSION_ID}, {HYPOTHESIS_ID}, {RUN_ID}, {LOG_PATH}`}
+                          variant="outlined"
+                          autoResize
+                        />
+                      </div>
+                      <div className="bitfun-debug-config__template-field">
+                        <label className="bitfun-debug-config__template-label">
+                          {tDebug('templates.region.label')}
+                        </label>
+                        <div className="bitfun-debug-config__region-inputs">
+                          <Input
+                            value={template.region_start}
+                            onChange={(e) => updateTemplate(language, { region_start: e.target.value })}
+                            placeholder={tDebug('templates.region.startPlaceholder')}
+                            variant="outlined"
+                            inputSize="small"
+                          />
+                          <Input
+                            value={template.region_end}
+                            onChange={(e) => updateTemplate(language, { region_end: e.target.value })}
+                            placeholder={tDebug('templates.region.endPlaceholder')}
+                            variant="outlined"
+                            inputSize="small"
+                          />
+                        </div>
+                      </div>
+                      {template.notes && template.notes.length > 0 && (
+                        <div className="bitfun-debug-config__template-field">
+                          <label className="bitfun-debug-config__template-label">
+                            {tDebug('templates.notes')}
+                          </label>
+                          <div className="bitfun-debug-config__template-notes">
+                            {template.notes.map((note, idx) => (
+                              <span key={idx} className="bitfun-debug-config__template-note">
+                                {note}
+                              </span>
+                            ))}
+                          </div>
+                        </div>
+                      )}
+                    </CardBody>
+                  )}
+                </Card>
+              );
+            })}
+          </div>
+
+          {debugHasChanges && (
+            <div className="bitfun-debug-config__modal-footer">
+              <Button
+                variant="primary"
+                size="small"
+                onClick={handleModalSave}
+                disabled={debugSaving}
+              >
+                {debugSaving ? tDebug('actions.saving') : tDebug('actions.save')}
+              </Button>
+              <Button
+                variant="secondary"
+                size="small"
+                onClick={handleModalCancel}
+                disabled={debugSaving}
+              >
+                {tDebug('actions.cancel')}
+              </Button>
+            </div>
+          )}
+        </Modal>
+
       </ConfigPageContent>
     </ConfigPageLayout>
   );
diff --git a/src/web-ui/src/infrastructure/config/components/TerminalConfig.scss b/src/web-ui/src/infrastructure/config/components/TerminalConfig.scss
deleted file mode 100644
index 3d6b2793..00000000
--- a/src/web-ui/src/infrastructure/config/components/TerminalConfig.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@use '../../../component-library/styles/tokens' as *;
-
-.bitfun-terminal-config {
-  &__content {
-    display: flex;
-    flex-direction: column;
-    gap: $size-gap-6;
-  }
-
-  &__select-wrapper {
-    width: 100%;
-  }
-
-  &__no-shells {
-    padding: 12px 16px;
-    border: 1px dashed var(--border-base);
-    border-radius: $size-radius-sm;
-    color: var(--color-text-muted);
-    font-size: $font-size-sm;
-  }
-
-  &__inline-alert {
-    border-top: 1px solid var(--border-subtle);
-    padding: $size-gap-3;
-  }
-
-}
-
-@container config-panel (max-width: 520px) {
-  .bitfun-terminal-config {
-    &__inline-alert {
-      padding: $size-gap-2;
-    }
-  }
-}
diff --git a/src/web-ui/src/infrastructure/config/components/TerminalConfig.tsx b/src/web-ui/src/infrastructure/config/components/TerminalConfig.tsx
deleted file mode 100644
index 0cff0aa0..00000000
--- a/src/web-ui/src/infrastructure/config/components/TerminalConfig.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-import React, { useState, useEffect, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Download } from 'lucide-react';
-import {
-  Alert,
-  Select,
-  ConfigPageLoading,
-  ConfigPageMessage,
-  ConfigPageRefreshButton,
-} from '@/component-library';
-import { ConfigPageHeader, ConfigPageLayout, ConfigPageContent, ConfigPageSection, ConfigPageRow } from './common';
-import { configManager } from '../services/ConfigManager';
-import { getTerminalService } from '@/tools/terminal';
-import { systemAPI } from '@/infrastructure/api/service-api/SystemAPI';
-import { createLogger } from '@/shared/utils/logger';
-import type { TerminalConfig as TerminalConfigType } from '../types';
-import type { ShellInfo } from '@/tools/terminal/types/session';
-import './TerminalConfig.scss';
-
-const log = createLogger('TerminalConfig');
-
-const TerminalConfig: React.FC = () => {
-  const { t } = useTranslation('settings/terminal');
-  const [defaultShell, setDefaultShell] = useState<string>('');
-  const [availableShells, setAvailableShells] = useState<ShellInfo[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
-  const [message, setMessage] = useState<{ type: 'success' | 'error' | 'info'; text: string } | null>(null);
-  const [platform, setPlatform] = useState<string>('');
-
-  useEffect(() => {
-    loadData();
-  }, []);
-
-  const loadData = async () => {
-    try {
-      setLoading(true);
-
-      const [terminalConfig, shells, systemInfo] = await Promise.all([
-        configManager.getConfig<TerminalConfigType>('terminal'),
-        getTerminalService().getAvailableShells(),
-        systemAPI.getSystemInfo().catch(() => ({ platform: '' }))
-      ]);
-
-      setDefaultShell(terminalConfig?.default_shell || '');
-
-      const availableOnly = shells.filter(s => s.available);
-      setAvailableShells(availableOnly);
-
-      setPlatform(systemInfo.platform || '');
-    } catch (error) {
-      log.error('Failed to load terminal config data', error);
-      showMessage('error', t('messages.loadFailed'));
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleShellChange = useCallback(async (value: string) => {
-    try {
-      setSaving(true);
-      setDefaultShell(value);
-
-      await configManager.setConfig('terminal.default_shell', value);
-
-      configManager.clearCache();
-
-      showMessage('success', t('messages.updated'));
-    } catch (error) {
-      log.error('Failed to save terminal config', { shell: value, error });
-      showMessage('error', t('messages.saveFailed'));
-    } finally {
-      setSaving(false);
-    }
-  }, [t]);
-
-  const showMessage = (type: 'success' | 'error' | 'info', text: string) => {
-    setMessage({ type, text });
-    setTimeout(() => setMessage(null), 3000);
-  };
-
-  const handleRefresh = useCallback(async () => {
-    await loadData();
-    showMessage('info', t('messages.refreshed'));
-  }, [t]);
-
-  const shouldShowPowerShellCoreRecommendation = useCallback(() => {
-    const isWindows = platform === 'windows';
-    if (!isWindows) return false;
-
-    const hasPowerShellCore = availableShells.some(
-      shell => shell.shellType === 'PowerShellCore'
-    );
-
-    return !hasPowerShellCore;
-  }, [availableShells, platform]);
-
-  const shellOptions = [
-    { value: '', label: t('terminal.autoDetect') },
-    ...availableShells.map(shell => ({
-      value: shell.shellType,
-      label: `${shell.name}${shell.version ? ` (${shell.version})` : ''}`
-    }))
-  ];
-
-  if (loading) {
-    return (
-      <ConfigPageLayout className="bitfun-terminal-config">
-        <ConfigPageHeader
-          title={t('title')}
-          subtitle={t('subtitle')}
-        />
-        <ConfigPageContent>
-          <ConfigPageLoading text={t('messages.loading')} />
-        </ConfigPageContent>
-      </ConfigPageLayout>
-    );
-  }
-
-  return (
-    <ConfigPageLayout className="bitfun-terminal-config">
-      <ConfigPageHeader
-        title={t('title')}
-        subtitle={t('subtitle')}
-      />
-
-      <ConfigPageContent className="bitfun-terminal-config__content">
-
-        <ConfigPageMessage message={message} />
-
-        {shouldShowPowerShellCoreRecommendation() && (
-          <div className="bitfun-terminal-config__message-container">
-            <Alert
-              type="info"
-              message={
-                <span style={{ display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'wrap' }}>
-                  <Download size={16} />
-                  <span>{t('recommendations.pwsh.prefix')} </span>
-                  <strong>{t('recommendations.pwsh.name')}</strong>
-                  <span>{t('recommendations.pwsh.suffix')}</span>
-                  <a
-                    href="https://aka.ms/PSWindows"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    style={{
-                      color: 'var(--color-primary)',
-                      textDecoration: 'underline',
-                      display: 'inline-flex',
-                      alignItems: 'center',
-                      gap: '4px'
-                    }}
-                  >
-                    {t('recommendations.pwsh.link')}
-                  </a>
-                </span>
-              }
-            />
-          </div>
-        )}
-
-        <ConfigPageSection
-          title={t('sections.defaultTerminal')}
-          extra={(
-            <ConfigPageRefreshButton
-              tooltip={t('terminal.refreshTooltip')}
-              onClick={handleRefresh}
-              loading={loading}
-              disabled={loading}
-            />
-          )}
-        >
-          <ConfigPageRow
-            label={t('sections.defaultTerminal')}
-            description={t('terminal.description')}
-            align="center"
-          >
-            <div className="bitfun-terminal-config__select-wrapper">
-              {availableShells.length > 0 ? (
-                <Select
-                  value={defaultShell}
-                  onChange={(v) => handleShellChange(v as string)}
-                  options={shellOptions}
-                  placeholder={t('terminal.placeholder')}
-                  disabled={saving}
-                />
-              ) : (
-                <div className="bitfun-terminal-config__no-shells">
-                  {t('terminal.noShells')}
-                </div>
-              )}
-            </div>
-          </ConfigPageRow>
-
-          {platform === 'windows' && defaultShell === 'Cmd' && (
-            <div className="bitfun-terminal-config__inline-alert">
-              <Alert type="warning" message={t('terminal.warnings.cmd')} />
-            </div>
-          )}
-          {platform === 'windows' && defaultShell === 'Bash' && (
-            <div className="bitfun-terminal-config__inline-alert">
-              <Alert type="warning" message={t('terminal.warnings.gitBash')} />
-            </div>
-          )}
-        </ConfigPageSection>
-      </ConfigPageContent>
-    </ConfigPageLayout>
-  );
-};
-
-export default TerminalConfig;
diff --git a/src/web-ui/src/infrastructure/config/components/ThemeConfig.tsx b/src/web-ui/src/infrastructure/config/components/ThemeConfig.tsx
deleted file mode 100644
index 116b36d9..00000000
--- a/src/web-ui/src/infrastructure/config/components/ThemeConfig.tsx
+++ /dev/null
@@ -1,444 +0,0 @@
- 
-
-import { useState, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Upload } from 'lucide-react';
-import { useTheme, useThemeManagement, ThemeMetadata, ThemeConfig as ThemeConfigType } from '@/infrastructure/theme';
-import { themeService } from '@/infrastructure/theme/core/ThemeService';
-import { useLanguageSelector } from '@/infrastructure/i18n';
-import type { LocaleId } from '@/infrastructure/i18n/types';
-import {
-  ConfigPageHeader,
-  ConfigPageLayout,
-  ConfigPageContent,
-  ConfigPageSection,
-  ConfigPageRow,
-} from './common';
-import { IconButton, Tooltip, Select } from '@/component-library';
-import { createLogger } from '@/shared/utils/logger';
-import './ThemeConfig.scss';
-
-const log = createLogger('ThemeConfig');
-
-export function ThemeConfig() {
-  const { t } = useTranslation('settings/theme');
-  const { themeId, themes, setTheme, loading } = useTheme();
-  const { importTheme } = useThemeManagement();
-  const { currentLanguage, supportedLocales, selectLanguage, isChanging } = useLanguageSelector();
-  const [importing, setImporting] = useState(false);
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  
-  
-  const handleThemeChange = async (newThemeId: string) => {
-    await setTheme(newThemeId);
-  };
-  
-  const handleImportTheme = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const file = event.target.files?.[0];
-    if (!file) return;
-    
-    setImporting(true);
-    try {
-      const text = await file.text();
-      const themeData = JSON.parse(text);
-      await importTheme(themeData);
-      alert(t('theme.importSuccess'));
-    } catch (error) {
-      log.error('Failed to import theme', error);
-      alert(t('theme.importFailed'));
-    } finally {
-      setImporting(false);
-      
-      event.target.value = '';
-    }
-  };
-  
-  
-  const handleImportClick = () => {
-    fileInputRef.current?.click();
-  };
-
-  const getThemeDisplayName = (theme: ThemeMetadata) => {
-    const i18nKey = `theme.presets.${theme.id}`;
-    return theme.builtin
-      ? t(`${i18nKey}.name`, { defaultValue: theme.name })
-      : theme.name;
-  };
-
-  const getThemeDisplayDescription = (theme: ThemeMetadata) => {
-    const i18nKey = `theme.presets.${theme.id}`;
-    return theme.builtin
-      ? t(`${i18nKey}.description`, { defaultValue: theme.description || '' })
-      : theme.description || '';
-  };
-  
-  return (
-    <ConfigPageLayout className="theme-config">
-      <ConfigPageHeader
-        title={t('theme.title')}
-        subtitle={t('theme.subtitle')}
-      />
-      
-      <ConfigPageContent className="theme-config__content">
-        <ConfigPageSection
-          title={t('theme.language')}
-          description={t('theme.languageSectionHint', { defaultValue: 'Configure display language for the interface.' })}
-        >
-          <ConfigPageRow
-            label={t('theme.language')}
-            description={t('theme.languageRowHint', { defaultValue: 'Choose one language pack as the active UI language.' })}
-            align="center"
-          >
-            <div className="theme-config__language-select">
-              <Select
-                value={currentLanguage}
-                onChange={(value) => selectLanguage(String(Array.isArray(value) ? value[0] ?? '' : value) as LocaleId)}
-                options={supportedLocales.map((locale) => ({
-                  value: locale.id,
-                  label: locale.nativeName,
-                }))}
-                disabled={isChanging}
-                placeholder={t('theme.language')}
-              />
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-
-        <ConfigPageSection
-          title={t('theme.themes')}
-          description={t('theme.themeSectionHint', { defaultValue: 'Select, import, export, or manage visual themes.' })}
-          extra={
-            <>
-              <IconButton
-                variant="ghost"
-                size="small"
-                onClick={handleImportClick}
-                disabled={importing || loading}
-                isLoading={importing}
-                title={importing ? t('theme.importing') : t('theme.importTheme')}
-              >
-                <Upload size={16} />
-              </IconButton>
-              <input
-                ref={fileInputRef}
-                type="file"
-                accept=".json"
-                onChange={handleImportTheme}
-                style={{ display: 'none' }}
-              />
-            </>
-          }
-        >
-          <ConfigPageRow
-            label={t('theme.themes')}
-            description={t('theme.themeRowHint', { defaultValue: 'Pick an installed theme or manage custom themes.' })}
-            align="center"
-          >
-            <div className="theme-config__theme-picker">
-              <div className="theme-config__theme-select">
-                <Select
-                  value={themeId ?? ''}
-                  onChange={(value) => handleThemeChange(value as string)}
-                  disabled={loading}
-                  options={themes.map((theme) => ({
-                    value: theme.id,
-                    label: getThemeDisplayName(theme),
-                    description: getThemeDisplayDescription(theme),
-                  }))}
-                  renderOption={(option) => {
-                    const theme = themes.find((item) => item.id === String(option.value));
-                    const fullTheme = theme ? themeService.getTheme(theme.id) : null;
-                    const optionContent = (
-                      <div className="theme-config__theme-option">
-                        <span className="theme-config__theme-option-name">{option.label}</span>
-                        {option.description && (
-                          <span className="theme-config__theme-option-desc">{option.description}</span>
-                        )}
-                      </div>
-                    );
-
-                    if (!fullTheme) return optionContent;
-
-                    return (
-                      <Tooltip
-                        content={<ThemePreviewThumbnail theme={fullTheme} />}
-                        placement="right"
-                        delay={300}
-                        className="theme-preview-tooltip"
-                      >
-                        {optionContent}
-                      </Tooltip>
-                    );
-                  }}
-                />
-              </div>
-            </div>
-          </ConfigPageRow>
-        </ConfigPageSection>
-      </ConfigPageContent>
-    </ConfigPageLayout>
-  );
-}
-
- 
-interface ThemePreviewThumbnailProps {
-  theme: ThemeConfigType;
-}
-
-function ThemePreviewThumbnail({ theme }: ThemePreviewThumbnailProps) {
-  const { colors } = theme;
-  
-  return (
-    <div 
-      className="theme-preview-thumbnail"
-      style={{
-        background: colors.background.primary,
-        borderColor: colors.border.base,
-      }}
-    >
-      
-      <div 
-        className="theme-preview-thumbnail__titlebar"
-        style={{ 
-          background: colors.background.secondary,
-          borderColor: colors.border.subtle,
-        }}
-      >
-        
-        <div className="theme-preview-thumbnail__menu">
-          <span 
-            className="theme-preview-thumbnail__menu-dot"
-            style={{ background: colors.accent['500'] }}
-          />
-        </div>
-        
-        
-        <div 
-          className="theme-preview-thumbnail__title"
-          style={{ color: colors.text.muted }}
-        >
-          BitFun
-        </div>
-        
-        
-        <div className="theme-preview-thumbnail__window-controls">
-          
-          <span 
-            className="theme-preview-thumbnail__window-btn"
-            style={{ color: colors.text.secondary }}
-          >
-            <svg width="8" height="8" viewBox="0 0 14 14" fill="none">
-              <line x1="3" y1="7" x2="11" y2="7" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"/>
-            </svg>
-          </span>
-          
-          <span 
-            className="theme-preview-thumbnail__window-btn"
-            style={{ color: colors.text.secondary }}
-          >
-            <svg width="8" height="8" viewBox="0 0 12 12" fill="none">
-              <rect x="2" y="2" width="8" height="8" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
-            </svg>
-          </span>
-          
-          <span 
-            className="theme-preview-thumbnail__window-btn theme-preview-thumbnail__window-btn--close"
-            style={{ color: colors.text.secondary }}
-          >
-            <svg width="8" height="8" viewBox="0 0 14 14" fill="none">
-              <line x1="3" y1="3" x2="11" y2="11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"/>
-              <line x1="11" y1="3" x2="3" y2="11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"/>
-            </svg>
-          </span>
-        </div>
-      </div>
-      
-      
-      <div className="theme-preview-thumbnail__main">
-        
-        <div 
-          className="theme-preview-thumbnail__sidebar"
-          style={{ 
-            background: colors.background.secondary,
-            borderColor: colors.border.subtle,
-          }}
-        >
-          
-          <div className="theme-preview-thumbnail__tree-item">
-            <span 
-              className="theme-preview-thumbnail__folder-icon"
-              style={{ background: colors.accent['500'] }}
-            />
-            <span 
-              className="theme-preview-thumbnail__tree-text"
-              style={{ background: colors.text.secondary }}
-            />
-          </div>
-          
-          {[1, 2, 3].map((i) => (
-            <div key={i} className="theme-preview-thumbnail__tree-item theme-preview-thumbnail__tree-item--file">
-              <span 
-                className="theme-preview-thumbnail__file-icon"
-                style={{ background: colors.semantic.info }}
-              />
-              <span 
-                className="theme-preview-thumbnail__tree-text theme-preview-thumbnail__tree-text--short"
-                style={{ background: colors.text.muted }}
-              />
-            </div>
-          ))}
-        </div>
-        
-        
-        <div 
-          className="theme-preview-thumbnail__chat"
-          style={{ background: colors.background.scene }}
-        >
-          
-          <div 
-            className="theme-preview-thumbnail__message theme-preview-thumbnail__message--user"
-            style={{ 
-              background: colors.accent['200'],
-              borderColor: colors.accent['400'],
-            }}
-          >
-            <div 
-              className="theme-preview-thumbnail__message-line"
-              style={{ background: colors.text.primary }}
-            />
-          </div>
-          
-          <div 
-            className="theme-preview-thumbnail__message theme-preview-thumbnail__message--ai"
-            style={{ 
-              background: colors.element.subtle,
-              borderColor: colors.border.subtle,
-            }}
-          >
-            <div 
-              className="theme-preview-thumbnail__message-line"
-              style={{ background: colors.text.secondary }}
-            />
-            <div 
-              className="theme-preview-thumbnail__message-line theme-preview-thumbnail__message-line--short"
-              style={{ background: colors.text.muted }}
-            />
-          </div>
-          
-          <div 
-            className="theme-preview-thumbnail__code-block"
-            style={{ 
-              background: colors.background.tertiary,
-              borderColor: colors.border.base,
-            }}
-          >
-            <div 
-              className="theme-preview-thumbnail__code-line"
-              style={{ background: colors.purple?.['500'] || colors.accent['500'] }}
-            />
-            <div 
-              className="theme-preview-thumbnail__code-line theme-preview-thumbnail__code-line--long"
-              style={{ background: colors.semantic.success }}
-            />
-          </div>
-        </div>
-        
-        
-        <div 
-          className="theme-preview-thumbnail__editor"
-          style={{ 
-            background: colors.background.workbench,
-            borderColor: colors.border.subtle,
-          }}
-        >
-          
-          <div 
-            className="theme-preview-thumbnail__tabs"
-            style={{ 
-              background: colors.background.secondary,
-              borderColor: colors.border.subtle,
-            }}
-          >
-            <span 
-              className="theme-preview-thumbnail__tab theme-preview-thumbnail__tab--active"
-              style={{ 
-                background: colors.background.primary,
-                borderColor: colors.accent['500'],
-              }}
-            />
-            <span 
-              className="theme-preview-thumbnail__tab"
-              style={{ background: colors.element.subtle }}
-            />
-          </div>
-          
-          <div className="theme-preview-thumbnail__code-content">
-            {[1, 2, 3, 4, 5].map((i) => (
-              <div key={i} className="theme-preview-thumbnail__editor-line">
-                <span 
-                  className="theme-preview-thumbnail__line-number"
-                  style={{ background: colors.text.disabled }}
-                />
-                <span 
-                  className="theme-preview-thumbnail__line-code"
-                  style={{ 
-                    background: i % 2 === 0 ? colors.accent['500'] : colors.text.secondary,
-                    width: `${30 + (i * 8) % 40}%`,
-                  }}
-                />
-              </div>
-            ))}
-          </div>
-        </div>
-      </div>
-      
-      
-      <div 
-        className="theme-preview-thumbnail__statusbar"
-        style={{ 
-          background: colors.background.secondary,
-          borderColor: colors.border.subtle,
-        }}
-      >
-        
-        <div className="theme-preview-thumbnail__status-section">
-          <span 
-            className="theme-preview-thumbnail__status-icon"
-            style={{ background: colors.accent['500'] }}
-          />
-          <span 
-            className="theme-preview-thumbnail__status-text"
-            style={{ background: colors.text.muted }}
-          />
-        </div>
-        
-        
-        <div className="theme-preview-thumbnail__status-section">
-          <span 
-            className="theme-preview-thumbnail__git-icon"
-            style={{ color: colors.git.branch }}
-          >
-            <svg width="7" height="7" viewBox="0 0 16 16" fill="none">
-              <circle cx="4" cy="4" r="2" stroke="currentColor" strokeWidth="1.5"/>
-              <circle cx="12" cy="12" r="2" stroke="currentColor" strokeWidth="1.5"/>
-              <circle cx="12" cy="4" r="2" stroke="currentColor" strokeWidth="1.5"/>
-              <path d="M4 6v4c0 1.1.9 2 2 2h4" stroke="currentColor" strokeWidth="1.5"/>
-            </svg>
-          </span>
-          <span 
-            className="theme-preview-thumbnail__status-text theme-preview-thumbnail__status-text--branch"
-            style={{ background: colors.git.branch }}
-          />
-        </div>
-        
-        
-        <span 
-          className="theme-preview-thumbnail__status-icon theme-preview-thumbnail__status-icon--notification"
-          style={{ background: colors.semantic.info }}
-        />
-      </div>
-    </div>
-  );
-}
-
- 
diff --git a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.scss b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.scss
index 7dcf9acf..5f1cb327 100644
--- a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.scss
+++ b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.scss
@@ -15,18 +15,28 @@
   font-family: var(--font-family-sans);
   /* Shared layout contract for settings pages in wide scenes. */
   --config-page-content-inline-padding: clamp(16px, 2.2vw, 28px);
-  --config-page-content-bottom-padding: var(--size-gap-6, 24px);
+  --config-page-content-bottom-padding: var(--size-gap-12, 48px);
   --config-page-content-max-width: 600px;
+  /* Vertical gap between top-level sections (ConfigPageSection blocks) inside ConfigPageContent. */
+  --config-page-section-gap: var(--size-gap-10, 40px);
   container-type: inline-size;
   container-name: config-panel;
 }
 
+.bitfun-config-page-layout__scroll-end-spacer {
+  flex-shrink: 0;
+  width: 100%;
+  height: var(--config-page-content-bottom-padding);
+  pointer-events: none;
+}
 
 .bitfun-config-page-content {
-  flex: 1;
+  /* flex-shrink: 0 — do NOT shrink below natural content height.
+   * This ensures the flex layout positions the scroll-end spacer AFTER
+   * the actual content, not at the flex-allocated truncated position. */
+  flex-shrink: 0;
   overflow: visible;
-  padding: 0 var(--config-page-content-inline-padding) var(--config-page-content-bottom-padding);
-  min-height: 0;
+  padding: 0 var(--config-page-content-inline-padding);
 }
 
 .bitfun-config-page-content__inner {
@@ -34,7 +44,7 @@
   margin-inline: auto;
   display: flex;
   flex-direction: column;
-  gap: var(--size-gap-6, 24px);
+  gap: var(--config-page-section-gap);
 }
 
 .bitfun-config-page-section {
@@ -152,8 +162,9 @@
 @container config-panel (max-width: 900px) {
   .bitfun-config-page-layout {
     --config-page-content-inline-padding: var(--size-gap-4, 16px);
-    --config-page-content-bottom-padding: var(--size-gap-5, 20px);
+    --config-page-content-bottom-padding: var(--size-gap-10, 40px);
     --config-page-content-max-width: 100%;
+    --config-page-section-gap: var(--size-gap-8, 32px);
   }
 }
 
diff --git a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
index c8784ce1..aba9e805 100644
--- a/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
+++ b/src/web-ui/src/infrastructure/config/components/common/ConfigPageLayout.tsx
@@ -18,6 +18,8 @@ export const ConfigPageLayout: React.FC<ConfigPageLayoutProps> = ({
   return (
     <div className={`bitfun-config-page-layout ${className}`}>
       {children}
+      {/* Real DOM spacer: keeps a guaranteed blank tail at the end of the scroll range. */}
+      <div className="bitfun-config-page-layout__scroll-end-spacer" aria-hidden="true" />
     </div>
   );
 };
diff --git a/src/web-ui/src/infrastructure/config/components/index.ts b/src/web-ui/src/infrastructure/config/components/index.ts
index a10b5fe1..c762d3b3 100644
--- a/src/web-ui/src/infrastructure/config/components/index.ts
+++ b/src/web-ui/src/infrastructure/config/components/index.ts
@@ -1,12 +1,10 @@
 
 export { default as AIModelConfig } from './AIModelConfig';
-export { ThemeConfig } from './ThemeConfig';
 export { default as AIRulesMemoryConfig } from './AIRulesMemoryConfig';
 export { default as MCPResourceBrowser } from './MCPResourceBrowser';
 export { default as McpToolsConfig } from './McpToolsConfig';
 export { default as EditorConfig } from './EditorConfig';
-export { default as TerminalConfig } from './TerminalConfig';
-export { default as LoggingConfig } from './LoggingConfig';
+export { default as BasicsConfig } from './BasicsConfig';
 
 
 export { default as DefaultModelConfig } from './DefaultModelConfig';
diff --git a/src/web-ui/src/infrastructure/config/services/AIExperienceConfigService.ts b/src/web-ui/src/infrastructure/config/services/AIExperienceConfigService.ts
index 7986101f..665a49eb 100644
--- a/src/web-ui/src/infrastructure/config/services/AIExperienceConfigService.ts
+++ b/src/web-ui/src/infrastructure/config/services/AIExperienceConfigService.ts
@@ -6,18 +6,15 @@ import { createLogger } from '@/shared/utils/logger';
 const log = createLogger('AIExperienceConfig');
 
 export interface AIExperienceSettings {
-   
   enable_session_title_generation: boolean;
-  
-   
-  enable_welcome_panel_ai_analysis: boolean;
+  enable_visual_mode: boolean;
 }
 
 const CONFIG_PATH = 'app.ai_experience';
 
 const defaultSettings: AIExperienceSettings = {
   enable_session_title_generation: true,
-  enable_welcome_panel_ai_analysis: false,
+  enable_visual_mode: false,
 };
 
  
@@ -95,12 +92,6 @@ export class AIExperienceConfigService {
     return this.getSettings().enable_session_title_generation;
   }
 
-   
-  isWelcomePanelAIAnalysisEnabled(): boolean {
-    return this.getSettings().enable_welcome_panel_ai_analysis;
-  }
-
-   
   addChangeListener(listener: (settings: AIExperienceSettings) => void): () => void {
     this.listeners.add(listener);
     
diff --git a/src/web-ui/src/infrastructure/config/types/index.ts b/src/web-ui/src/infrastructure/config/types/index.ts
index 21962872..afde50ea 100644
--- a/src/web-ui/src/infrastructure/config/types/index.ts
+++ b/src/web-ui/src/infrastructure/config/types/index.ts
@@ -35,7 +35,7 @@ export interface AppLoggingConfig {
 }
 
 export interface AppSessionConfig {
-  default_mode: 'code' | 'cowork';
+  // Reserved; legacy `default_mode` in saved JSON is ignored by the app.
 }
 
 export interface SidebarConfig {
@@ -55,10 +55,7 @@ export interface NotificationConfig {
 }
 
 export interface AIExperienceConfig {
-   
   enable_session_title_generation: boolean;
-   
-  enable_welcome_panel_ai_analysis: boolean;
 
   /** Whether to enable visual mode (use Mermaid diagrams to illustrate complex logic and flows). */
   enable_visual_mode: boolean;
@@ -515,7 +512,6 @@ export type ConfigPath =
   | 'app.auto_update'
   | 'app.telemetry'
   | 'app.session_config'
-  | 'app.session_config.default_mode'
   | 'app.sidebar'
   | 'app.sidebar.width'
   | 'app.sidebar.collapsed'
diff --git a/src/web-ui/src/infrastructure/i18n/core/I18nService.ts b/src/web-ui/src/infrastructure/i18n/core/I18nService.ts
index 56565d23..bc6cb9c2 100644
--- a/src/web-ui/src/infrastructure/i18n/core/I18nService.ts
+++ b/src/web-ui/src/infrastructure/i18n/core/I18nService.ts
@@ -44,13 +44,11 @@ import zhCNSettingsAiModel from '../../../locales/zh-CN/settings/ai-model.json';
 import zhCNSettingsAgenticTools from '../../../locales/zh-CN/settings/agentic-tools.json';
 import zhCNSettingsMcp from '../../../locales/zh-CN/settings/mcp.json';
 import zhCNSettingsMcpTools from '../../../locales/zh-CN/settings/mcp-tools.json';
-import zhCNSettingsTheme from '../../../locales/zh-CN/settings/theme.json';
+import zhCNSettingsBasics from '../../../locales/zh-CN/settings/basics.json';
 import zhCNSettingsAiFeatures from '../../../locales/zh-CN/settings/ai-features.json';
 import zhCNSettingsSessionConfig from '../../../locales/zh-CN/settings/session-config.json';
 import zhCNSettingsLsp from '../../../locales/zh-CN/settings/lsp.json';
-import zhCNSettingsTerminal from '../../../locales/zh-CN/settings/terminal.json';
 import zhCNSettingsDebug from '../../../locales/zh-CN/settings/debug.json';
-import zhCNSettingsLogging from '../../../locales/zh-CN/settings/logging.json';
 import zhCNSettingsEditor from '../../../locales/zh-CN/settings/editor.json';
 import zhCNSettingsSkills from '../../../locales/zh-CN/settings/skills.json';
 import zhCNSettingsAiRules from '../../../locales/zh-CN/settings/ai-rules.json';
@@ -83,13 +81,11 @@ import enUSSettingsAiModel from '../../../locales/en-US/settings/ai-model.json';
 import enUSSettingsAgenticTools from '../../../locales/en-US/settings/agentic-tools.json';
 import enUSSettingsMcp from '../../../locales/en-US/settings/mcp.json';
 import enUSSettingsMcpTools from '../../../locales/en-US/settings/mcp-tools.json';
-import enUSSettingsTheme from '../../../locales/en-US/settings/theme.json';
+import enUSSettingsBasics from '../../../locales/en-US/settings/basics.json';
 import enUSSettingsAiFeatures from '../../../locales/en-US/settings/ai-features.json';
 import enUSSettingsSessionConfig from '../../../locales/en-US/settings/session-config.json';
 import enUSSettingsLsp from '../../../locales/en-US/settings/lsp.json';
-import enUSSettingsTerminal from '../../../locales/en-US/settings/terminal.json';
 import enUSSettingsDebug from '../../../locales/en-US/settings/debug.json';
-import enUSSettingsLogging from '../../../locales/en-US/settings/logging.json';
 import enUSSettingsEditor from '../../../locales/en-US/settings/editor.json';
 import enUSSettingsSkills from '../../../locales/en-US/settings/skills.json';
 import enUSSettingsAiRules from '../../../locales/en-US/settings/ai-rules.json';
@@ -129,13 +125,11 @@ const resources = {
     'settings/agentic-tools': zhCNSettingsAgenticTools,
     'settings/mcp': zhCNSettingsMcp,
     'settings/mcp-tools': zhCNSettingsMcpTools,
-    'settings/theme': zhCNSettingsTheme,
+    'settings/basics': zhCNSettingsBasics,
     'settings/ai-features': zhCNSettingsAiFeatures,
     'settings/session-config': zhCNSettingsSessionConfig,
     'settings/lsp': zhCNSettingsLsp,
-    'settings/terminal': zhCNSettingsTerminal,
     'settings/debug': zhCNSettingsDebug,
-    'settings/logging': zhCNSettingsLogging,
     'settings/editor': zhCNSettingsEditor,
     'settings/skills': zhCNSettingsSkills,
     'settings/ai-rules': zhCNSettingsAiRules,
@@ -169,13 +163,11 @@ const resources = {
     'settings/agentic-tools': enUSSettingsAgenticTools,
     'settings/mcp': enUSSettingsMcp,
     'settings/mcp-tools': enUSSettingsMcpTools,
-    'settings/theme': enUSSettingsTheme,
+    'settings/basics': enUSSettingsBasics,
     'settings/ai-features': enUSSettingsAiFeatures,
     'settings/session-config': enUSSettingsSessionConfig,
     'settings/lsp': enUSSettingsLsp,
-    'settings/terminal': enUSSettingsTerminal,
     'settings/debug': enUSSettingsDebug,
-    'settings/logging': enUSSettingsLogging,
     'settings/editor': enUSSettingsEditor,
     'settings/skills': enUSSettingsSkills,
     'settings/ai-rules': enUSSettingsAiRules,
@@ -232,12 +224,10 @@ export class I18nService {
           'settings/agentic-tools',
           'settings/mcp',
           'settings/mcp-tools',
-          'settings/theme',
+          'settings/basics',
           'settings/ai-features',
           'settings/lsp',
-          'settings/terminal',
           'settings/debug',
-          'settings/logging',
           'settings/editor',
           'settings/skills',
           'settings/ai-rules',
diff --git a/src/web-ui/src/locales/en-US/common.json b/src/web-ui/src/locales/en-US/common.json
index 63f0bfc9..9c9e9de3 100644
--- a/src/web-ui/src/locales/en-US/common.json
+++ b/src/web-ui/src/locales/en-US/common.json
@@ -150,9 +150,6 @@
       "newCodeSession": "New Code session",
       "newCoworkSession": "New Cowork session",
       "newClawSession": "New Claw session",
-      "defaultModeIndicator": " (default)",
-      "newCodeSessionDefault": "New Code session (default)",
-      "newCoworkSessionDefault": "New Cowork session (default)",
       "modeCode": "Code",
       "modeCowork": "Cowork",
       "codeSessionMode": "Code Session",
diff --git a/src/web-ui/src/locales/en-US/scenes/profile.json b/src/web-ui/src/locales/en-US/scenes/profile.json
index dce7e799..965750ca 100644
--- a/src/web-ui/src/locales/en-US/scenes/profile.json
+++ b/src/web-ui/src/locales/en-US/scenes/profile.json
@@ -113,9 +113,7 @@
     "visualMode":         "Visual Mode",
     "visualModeDesc":     "Show visual feedback during execution",
     "sessionTitle":       "Auto-name Sessions",
-    "sessionTitleDesc":   "Auto-generate titles for new sessions",
-    "welcomeAnalysis":    "Welcome AI Analysis",
-    "welcomeAnalysisDesc": "Analyze project status on open"
+    "sessionTitleDesc":   "Auto-generate titles for new sessions"
   },
 
   "nursery": {
diff --git a/src/web-ui/src/locales/en-US/settings.json b/src/web-ui/src/locales/en-US/settings.json
index 5dcbe40c..a8aeba84 100644
--- a/src/web-ui/src/locales/en-US/settings.json
+++ b/src/web-ui/src/locales/en-US/settings.json
@@ -1,44 +1,39 @@
 {
   "title": "Settings",
   "configCenter": {
+    "title": "Settings",
     "selectConfig": "Select Configuration",
+    "searchPlaceholder": "Search settings…",
+    "searchNoResults": "No matching settings",
+    "searchClear": "Clear search",
+    "tabDescriptions": {
+      "basics": "Language, theme, logging, and terminal shell.",
+      "models": "AI models, API keys, providers, and proxy.",
+      "sessionConfig": "Session behavior, tools, and timeouts.",
+      "aiContext": "Rules and memory for AI context.",
+      "mcpTools": "MCP servers and tool integrations.",
+      "editor": "Editor font, display, and formatting.",
+      "lsp": "Language servers and code intelligence."
+    },
     "categories": {
       "general": "General",
       "smartCapabilities": "Smart Configuration",
       "devkit": "Dev Kit"
     },
     "tabs": {
-      "theme": "Appearance",
+      "basics": "Basics",
       "models": "Models",
       "sessionConfig": "Session Config",
       "aiRules": "Rules",
       "aiMemory": "Memory",
       "aiContext": "Rules & Memory",
       "skills": "Skills",
-      "mcpTools": "MCP & Tools",
+      "mcpTools": "MCP",
       "agents": "Agents",
       "editor": "Editor",
-      "lsp": "LSP",
-      "debug": "Debug",
-      "logging": "Logging",
-      "terminal": "Terminal"
+      "lsp": "LSP"
     }
   },
-  "theme": {
-    "title": "Appearance",
-    "subtitle": "Select theme and language",
-    "language": "Language",
-    "themes": "Themes",
-    "importTheme": "Import Theme",
-    "importing": "Importing...",
-    "builtIn": "Built-in",
-    "custom": "Custom",
-    "export": "Export",
-    "delete": "Delete",
-    "confirmDelete": "Are you sure you want to delete theme \"{{name}}\"?",
-    "importSuccess": "Theme imported successfully!",
-    "importFailed": "Failed to import theme. Please check the file format."
-  },
   "general": {
     "title": "General",
     "language": {
diff --git a/src/web-ui/src/locales/en-US/settings/ai-features.json b/src/web-ui/src/locales/en-US/settings/ai-features.json
index de09575d..db9298f7 100644
--- a/src/web-ui/src/locales/en-US/settings/ai-features.json
+++ b/src/web-ui/src/locales/en-US/settings/ai-features.json
@@ -17,10 +17,6 @@
       "subtitle": "AI automatically generates concise titles for new conversations",
       "warning": "Session title will use first 20 characters of user message"
     },
-    "welcomeAnalysis": {
-      "title": "Welcome Page Analysis",
-      "subtitle": "Analyze work status and provide action suggestions"
-    },
     "compression": {
       "title": "Context Compression",
       "subtitle": "Intelligently compress long conversation context"
diff --git a/src/web-ui/src/locales/en-US/settings/basics.json b/src/web-ui/src/locales/en-US/settings/basics.json
new file mode 100644
index 00000000..2afafd30
--- /dev/null
+++ b/src/web-ui/src/locales/en-US/settings/basics.json
@@ -0,0 +1,121 @@
+{
+  "title": "Basics",
+  "subtitle": "Interface language, theme, logging, and terminal",
+  "appearance": {
+    "title": "Appearance",
+    "hint": "Interface language and visual theme",
+    "language": "Language",
+    "themes": "Themes",
+    "importTheme": "Import Theme",
+    "importing": "Importing...",
+    "builtIn": "Built-in",
+    "custom": "Custom",
+    "export": "Export",
+    "delete": "Delete",
+    "confirmDelete": "Are you sure you want to delete theme \"{{name}}\"?",
+    "importSuccess": "Theme imported successfully!",
+    "importFailed": "Failed to import theme. Please check the file format.",
+    "languageRowHint": "Choose one language pack as the active UI language.",
+    "themeRowHint": "Pick an installed theme or manage custom themes.",
+    "presets": {
+      "bitfun-dark": {
+        "name": "Dark",
+        "description": "Default dark theme"
+      },
+      "bitfun-light": {
+        "name": "Light",
+        "description": "Light theme - Elegant and refined, soft blue-gray tones"
+      },
+      "bitfun-midnight": {
+        "name": "Midnight",
+        "description": "Midnight gray dark theme - Professional and elegant, inspired by JetBrains IDE"
+      },
+      "bitfun-china-style": {
+        "name": "Ink Charm",
+        "description": "Chinese style theme - Rice paper and ink, blue and vermilion, warm and elegant"
+      },
+      "bitfun-china-night": {
+        "name": "Ink Night",
+        "description": "Chinese dark theme - Starlit ink night, moonlight like water, serene and elegant"
+      },
+      "bitfun-cyber": {
+        "name": "Cyber",
+        "description": "Tech-style theme - Deep black hole, neon future, ultimate tech aesthetics"
+      },
+      "bitfun-slate": {
+        "name": "Slate",
+        "description": "Slate gray geometric theme - Deep immersion, high contrast grayscale aesthetics"
+      }
+    }
+  },
+  "logging": {
+    "sections": {
+      "logging": "Logging",
+      "loggingHint": "Log level and directory for this session",
+      "level": "Log Level",
+      "path": "Startup Log Path"
+    },
+    "level": {
+      "description": "Controls log verbosity in real time. Changes apply immediately."
+    },
+    "path": {
+      "description": "Directory where log files for this run are written."
+    },
+    "levels": {
+      "trace": "Trace",
+      "debug": "Debug",
+      "info": "Info",
+      "warn": "Warn",
+      "error": "Error",
+      "off": "Off"
+    },
+    "actions": {
+      "refreshTooltip": "Refresh runtime status",
+      "openFolder": "Open Folder",
+      "openFolderTooltip": "Open log folder in file explorer"
+    },
+    "messages": {
+      "loading": "Loading...",
+      "loadFailed": "Failed to load logging configuration",
+      "saveFailed": "Failed to save logging level",
+      "levelUpdated": "Logging level updated",
+      "refreshed": "Runtime status refreshed",
+      "openedFolder": "Log folder opened",
+      "openFailed": "Failed to open log folder",
+      "pathUnavailable": "Log folder path is unavailable"
+    }
+  },
+  "terminal": {
+    "sections": {
+      "terminal": "Terminal",
+      "terminalHint": "Default shell and new terminal behavior",
+      "defaultTerminal": "Default Terminal"
+    },
+    "controls": {
+      "refreshTooltip": "Refresh available terminals",
+      "autoDetect": "Auto Detect (Recommended)",
+      "description": "Default shell type for new terminals",
+      "placeholder": "Select default terminal",
+      "noShells": "No available terminals detected"
+    },
+    "warnings": {
+      "cmd": "CMD does not support shell integration. AI commands will execute via PowerShell.",
+      "gitBash": "Git Bash with oh-my-zsh may cause shell integration to fail. If issues occur, switch to PowerShell."
+    },
+    "recommendations": {
+      "pwsh": {
+        "prefix": "We recommend installing",
+        "name": "PowerShell Core",
+        "suffix": "for better cross-platform experience and modern features",
+        "link": "Download"
+      }
+    },
+    "messages": {
+      "loading": "Loading...",
+      "loadFailed": "Failed to load configuration",
+      "updated": "Default terminal updated",
+      "saveFailed": "Failed to save configuration",
+      "refreshed": "Available terminals list refreshed"
+    }
+  }
+}
diff --git a/src/web-ui/src/locales/en-US/settings/debug.json b/src/web-ui/src/locales/en-US/settings/debug.json
index cbf47325..ab7eb85e 100644
--- a/src/web-ui/src/locales/en-US/settings/debug.json
+++ b/src/web-ui/src/locales/en-US/settings/debug.json
@@ -2,7 +2,9 @@
   "title": "Debug Config",
   "subtitle": "Log and language debug template configuration",
   "sections": {
-    "settings": "Basic Settings",
+    "combined": "Debug Mode Settings",
+    "combinedDescription": "Configure the debug agent's log path, ingest server port, and language-specific code instrumentation templates.",
+    "settings": "Debug Settings",
     "templates": "Language Debug Templates"
   },
   "languageLabels": {
@@ -39,6 +41,7 @@
       "endPlaceholder": "End marker"
     },
     "notes": "Notes",
+    "configure": "Configure",
     "reset": "Reset to Default Templates",
     "noteItems": {
       "javascript": {
diff --git a/src/web-ui/src/locales/en-US/settings/logging.json b/src/web-ui/src/locales/en-US/settings/logging.json
deleted file mode 100644
index 59aaad4c..00000000
--- a/src/web-ui/src/locales/en-US/settings/logging.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "title": "Logging",
-  "subtitle": "Runtime log level and startup log path",
-  "sections": {
-    "level": "Log Level",
-    "path": "Startup Log Path"
-  },
-  "level": {
-    "description": "Controls log verbosity in real time. Changes apply immediately."
-  },
-  "levels": {
-    "trace": "Trace",
-    "debug": "Debug",
-    "info": "Info",
-    "warn": "Warn",
-    "error": "Error",
-    "off": "Off"
-  },
-  "actions": {
-    "refreshTooltip": "Refresh runtime status",
-    "openFolder": "Open Folder",
-    "openFolderTooltip": "Open log folder in file explorer"
-  },
-  "messages": {
-    "loading": "Loading...",
-    "loadFailed": "Failed to load logging configuration",
-    "saveFailed": "Failed to save logging level",
-    "levelUpdated": "Logging level updated",
-    "refreshed": "Runtime status refreshed",
-    "openedFolder": "Log folder opened",
-    "openFailed": "Failed to open log folder",
-    "pathUnavailable": "Log folder path is unavailable"
-  }
-}
diff --git a/src/web-ui/src/locales/en-US/settings/mcp-tools.json b/src/web-ui/src/locales/en-US/settings/mcp-tools.json
index d9b412dd..77451993 100644
--- a/src/web-ui/src/locales/en-US/settings/mcp-tools.json
+++ b/src/web-ui/src/locales/en-US/settings/mcp-tools.json
@@ -1,4 +1,4 @@
 {
-  "title": "MCP & Tools",
-  "subtitle": "Manage MCP servers and tool execution behavior"
+  "title": "MCP",
+  "subtitle": "Manage MCP servers and JSON configuration"
 }
diff --git a/src/web-ui/src/locales/en-US/settings/session-config.json b/src/web-ui/src/locales/en-US/settings/session-config.json
index ab9b719d..9c24094c 100644
--- a/src/web-ui/src/locales/en-US/settings/session-config.json
+++ b/src/web-ui/src/locales/en-US/settings/session-config.json
@@ -1,30 +1,17 @@
 {
   "title": "Session Config",
-  "subtitle": "Configure session creation behavior and smart features",
-  "sections": {
-    "defaultMode": {
-      "title": "Default Mode for New Sessions",
-      "description": "The session type created by default when clicking the \"New Session\" button in the nav panel",
-      "code": "Code",
-      "codeDesc": "Standard AI coding session with code generation, debugging and tool calling",
-      "cowork": "Cowork",
-      "coworkDesc": "Collaborative session designed for multi-party cooperative work"
-    },
-    "smartFeatures": {
-      "title": "Smart Features"
-    }
-  },
+  "subtitle": "Session-related AI features and tool execution behavior",
   "features": {
     "sessionTitle": {
       "title": "Auto Session Title",
       "subtitle": "AI automatically generates concise titles for new conversations",
       "warning": "Session title will use first 20 characters of user message"
-    },
-    "welcomeAnalysis": {
-      "title": "Welcome Page Analysis",
-      "subtitle": "Analyze work status and provide action suggestions"
     }
   },
+  "toolExecution": {
+    "sectionTitle": "Tool execution behavior",
+    "sectionDescription": "Confirmation and timeout settings when tools run in a session."
+  },
   "model": {
     "label": "Model",
     "primary": "Primary Model",
diff --git a/src/web-ui/src/locales/en-US/settings/terminal.json b/src/web-ui/src/locales/en-US/settings/terminal.json
deleted file mode 100644
index 8004f8d7..00000000
--- a/src/web-ui/src/locales/en-US/settings/terminal.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "title": "Terminal",
-  "subtitle": "Terminal configuration",
-  "sections": {
-    "defaultTerminal": "Default Terminal"
-  },
-  "terminal": {
-    "refreshTooltip": "Refresh available terminals",
-    "autoDetect": "Auto Detect (Recommended)",
-    "description": "Default shell type for new terminals",
-    "placeholder": "Select default terminal",
-    "noShells": "No available terminals detected",
-    "warnings": {
-      "cmd": "CMD does not support shell integration. AI commands will execute via PowerShell.",
-      "gitBash": "Git Bash with oh-my-zsh may cause shell integration to fail. If issues occur, switch to PowerShell."
-    }
-  },
-  "recommendations": {
-    "pwsh": {
-      "prefix": "We recommend installing",
-      "name": "PowerShell Core",
-      "suffix": "for better cross-platform experience and modern features",
-      "link": "Download"
-    }
-  },
-  "messages": {
-    "loading": "Loading...",
-    "loadFailed": "Failed to load configuration",
-    "updated": "Default terminal updated",
-    "saveFailed": "Failed to save configuration",
-    "refreshed": "Available terminals list refreshed"
-  }
-}
diff --git a/src/web-ui/src/locales/en-US/settings/theme.json b/src/web-ui/src/locales/en-US/settings/theme.json
deleted file mode 100644
index 72b6ab31..00000000
--- a/src/web-ui/src/locales/en-US/settings/theme.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "theme": {
-    "title": "Appearance",
-    "subtitle": "Theme and language settings",
-    "language": "Language",
-    "themes": "Themes",
-    "importTheme": "Import Theme",
-    "importing": "Importing...",
-    "builtIn": "Built-in",
-    "custom": "Custom",
-    "export": "Export",
-    "delete": "Delete",
-    "confirmDelete": "Are you sure you want to delete theme \"{{name}}\"?",
-    "importSuccess": "Theme imported successfully!",
-    "importFailed": "Failed to import theme. Please check the file format.",
-    "languageSectionHint": "Configure display language for the interface.",
-    "languageRowHint": "Choose one language pack as the active UI language.",
-    "themeSectionHint": "Select, import, export, or manage visual themes.",
-    "themeRowHint": "Pick an installed theme or manage custom themes.",
-    "presets": {
-      "bitfun-dark": {
-        "name": "Dark",
-        "description": "Default dark theme"
-      },
-      "bitfun-light": {
-        "name": "Light",
-        "description": "Light theme - Elegant and refined, soft blue-gray tones"
-      },
-      "bitfun-midnight": {
-        "name": "Midnight",
-        "description": "Midnight gray dark theme - Professional and elegant, inspired by JetBrains IDE"
-      },
-      "bitfun-china-style": {
-        "name": "Ink Charm",
-        "description": "Chinese style theme - Rice paper and ink, blue and vermilion, warm and elegant"
-      },
-      "bitfun-china-night": {
-        "name": "Ink Night",
-        "description": "Chinese dark theme - Starlit ink night, moonlight like water, serene and elegant"
-      },
-      "bitfun-cyber": {
-        "name": "Cyber",
-        "description": "Tech-style theme - Deep black hole, neon future, ultimate tech aesthetics"
-      },
-      "bitfun-slate": {
-        "name": "Slate",
-        "description": "Slate gray geometric theme - Deep immersion, high contrast grayscale aesthetics"
-      }
-    }
-  }
-}
diff --git a/src/web-ui/src/locales/zh-CN/common.json b/src/web-ui/src/locales/zh-CN/common.json
index 393b04dc..39cf5adb 100644
--- a/src/web-ui/src/locales/zh-CN/common.json
+++ b/src/web-ui/src/locales/zh-CN/common.json
@@ -150,9 +150,6 @@
       "newCodeSession": "新建 Code 会话",
       "newCoworkSession": "新建 Cowork 会话",
       "newClawSession": "新建 Claw 会话",
-      "defaultModeIndicator": "（默认模式）",
-      "newCodeSessionDefault": "新建 Code 会话（默认模式）",
-      "newCoworkSessionDefault": "新建 Cowork 会话（默认模式）",
       "modeCode": "Code",
       "modeCowork": "Cowork",
       "codeSessionMode": "Code 会话",
diff --git a/src/web-ui/src/locales/zh-CN/scenes/profile.json b/src/web-ui/src/locales/zh-CN/scenes/profile.json
index 2be5dd2c..2423f44b 100644
--- a/src/web-ui/src/locales/zh-CN/scenes/profile.json
+++ b/src/web-ui/src/locales/zh-CN/scenes/profile.json
@@ -113,9 +113,7 @@
     "visualMode":         "可视化模式",
     "visualModeDesc":     "执行时显示可视化反馈",
     "sessionTitle":       "会话自动命名",
-    "sessionTitleDesc":   "新会话自动生成标题",
-    "welcomeAnalysis":    "欢迎页智能分析",
-    "welcomeAnalysisDesc": "打开项目时分析状态"
+    "sessionTitleDesc":   "新会话自动生成标题"
   },
 
   "nursery": {
diff --git a/src/web-ui/src/locales/zh-CN/settings.json b/src/web-ui/src/locales/zh-CN/settings.json
index 1f203b24..4ee15fab 100644
--- a/src/web-ui/src/locales/zh-CN/settings.json
+++ b/src/web-ui/src/locales/zh-CN/settings.json
@@ -1,44 +1,39 @@
 {
   "title": "设置",
   "configCenter": {
+    "title": "设置",
     "selectConfig": "选择配置项",
+    "searchPlaceholder": "搜索配置…",
+    "searchNoResults": "没有匹配的配置",
+    "searchClear": "清除搜索",
+    "tabDescriptions": {
+      "basics": "语言、主题、日志与终端 Shell。",
+      "models": "AI 模型、API 密钥、供应商与代理。",
+      "sessionConfig": "会话行为、工具与超时。",
+      "aiContext": "规则与记忆等 AI 上下文。",
+      "mcpTools": "MCP 服务器与工具集成。",
+      "editor": "编辑器字体、显示与格式化。",
+      "lsp": "语言服务与代码智能。"
+    },
     "categories": {
       "general": "通用",
       "smartCapabilities": "智慧化配置",
       "devkit": "开发套件"
     },
     "tabs": {
-      "theme": "外观",
+      "basics": "基础",
       "models": "模型",
       "sessionConfig": "会话配置",
       "aiRules": "规则",
       "aiMemory": "记忆",
       "aiContext": "规则 & 记忆",
       "skills": "技能",
-      "mcpTools": "MCP & 工具",
+      "mcpTools": "MCP",
       "agents": "智能体",
       "editor": "编辑器",
-      "lsp": "语言服务",
-      "debug": "调试",
-      "logging": "日志",
-      "terminal": "终端"
+      "lsp": "语言服务"
     }
   },
-  "theme": {
-    "title": "外观",
-    "subtitle": "选择主题和语言",
-    "language": "语言 / Language",
-    "themes": "主题",
-    "importTheme": "导入主题",
-    "importing": "导入中...",
-    "builtIn": "内置",
-    "custom": "自定义",
-    "export": "导出",
-    "delete": "删除",
-    "confirmDelete": "确定要删除主题 \"{{name}}\"？",
-    "importSuccess": "主题导入成功！",
-    "importFailed": "主题导入失败，请检查文件格式"
-  },
   "general": {
     "title": "通用",
     "language": {
diff --git a/src/web-ui/src/locales/zh-CN/settings/ai-features.json b/src/web-ui/src/locales/zh-CN/settings/ai-features.json
index 1a8329ba..93598002 100644
--- a/src/web-ui/src/locales/zh-CN/settings/ai-features.json
+++ b/src/web-ui/src/locales/zh-CN/settings/ai-features.json
@@ -17,10 +17,6 @@
       "subtitle": "新对话时AI自动生成简洁标题",
       "warning": "会话标题将使用用户消息的前20个字符"
     },
-    "welcomeAnalysis": {
-      "title": "欢迎页智能分析",
-      "subtitle": "分析工作状态并提供操作建议"
-    },
     "compression": {
       "title": "上下文压缩",
       "subtitle": "智能压缩长对话上下文"
diff --git a/src/web-ui/src/locales/zh-CN/settings/basics.json b/src/web-ui/src/locales/zh-CN/settings/basics.json
new file mode 100644
index 00000000..4f7b46f8
--- /dev/null
+++ b/src/web-ui/src/locales/zh-CN/settings/basics.json
@@ -0,0 +1,121 @@
+{
+  "title": "基础",
+  "subtitle": "界面语言、主题、日志与终端",
+  "appearance": {
+    "title": "外观",
+    "hint": "界面语言与视觉主题",
+    "language": "语言",
+    "themes": "主题",
+    "importTheme": "导入主题",
+    "importing": "导入中...",
+    "builtIn": "内置",
+    "custom": "自定义",
+    "export": "导出",
+    "delete": "删除",
+    "confirmDelete": "确定删除主题 \"{{name}}\" 吗？",
+    "importSuccess": "主题导入成功！",
+    "importFailed": "主题导入失败，请检查文件格式。",
+    "languageRowHint": "选择一个语言包作为当前界面语言。",
+    "themeRowHint": "选择已安装的主题或管理自定义主题。",
+    "presets": {
+      "bitfun-dark": {
+        "name": "暗色",
+        "description": "默认暗色主题"
+      },
+      "bitfun-light": {
+        "name": "亮色",
+        "description": "亮色主题 - 素雅高级，淡蓝灰调"
+      },
+      "bitfun-midnight": {
+        "name": "午夜",
+        "description": "午夜灰暗色主题 - 专业优雅，灵感来自 JetBrains IDE"
+      },
+      "bitfun-china-style": {
+        "name": "墨韵",
+        "description": "中国风主题 - 宣纸墨香，青花朱砂，温润典雅"
+      },
+      "bitfun-china-night": {
+        "name": "墨夜",
+        "description": "中国风暗色主题 - 墨夜星辰，月华如水，沉静典雅"
+      },
+      "bitfun-cyber": {
+        "name": "赛博",
+        "description": "科技感主题 - 深邃黑洞，霓虹未来，极致科技美学"
+      },
+      "bitfun-slate": {
+        "name": "石板灰",
+        "description": "石板灰几何主题 - 极深沉浸，高对比度灰度美学"
+      }
+    }
+  },
+  "logging": {
+    "sections": {
+      "logging": "日志",
+      "loggingHint": "日志级别与本次启动日志目录",
+      "level": "日志级别",
+      "path": "本次启动日志路径"
+    },
+    "level": {
+      "description": "实时控制日志输出级别，修改后立即生效。"
+    },
+    "path": {
+      "description": "本次启动写入日志文件所在的目录。"
+    },
+    "levels": {
+      "trace": "Trace",
+      "debug": "Debug",
+      "info": "Info",
+      "warn": "Warn",
+      "error": "Error",
+      "off": "Off"
+    },
+    "actions": {
+      "refreshTooltip": "刷新运行时状态",
+      "openFolder": "打开文件夹",
+      "openFolderTooltip": "在文件管理器中打开日志文件夹"
+    },
+    "messages": {
+      "loading": "加载中...",
+      "loadFailed": "加载日志配置失败",
+      "saveFailed": "保存日志级别失败",
+      "levelUpdated": "日志级别已更新",
+      "refreshed": "运行时状态已刷新",
+      "openedFolder": "日志文件夹已打开",
+      "openFailed": "打开日志文件夹失败",
+      "pathUnavailable": "日志文件夹路径不可用"
+    }
+  },
+  "terminal": {
+    "sections": {
+      "terminal": "终端",
+      "terminalHint": "默认 Shell 与新建终端行为",
+      "defaultTerminal": "默认终端"
+    },
+    "controls": {
+      "refreshTooltip": "刷新可用终端列表",
+      "autoDetect": "自动检测 (推荐)",
+      "description": "新建终端时使用的默认 Shell 类型",
+      "placeholder": "选择默认终端",
+      "noShells": "未检测到可用的终端"
+    },
+    "warnings": {
+      "cmd": "CMD 不支持 Shell 集成，AI 命令将通过 PowerShell 执行。",
+      "gitBash": "Git Bash 安装 oh-my-zsh 后可能导致 Shell 集成失效，如遇异常建议切换至 PowerShell。"
+    },
+    "recommendations": {
+      "pwsh": {
+        "prefix": "推荐安装使用",
+        "name": "PowerShell Core",
+        "suffix": "以获得更好的跨平台体验和现代化功能",
+        "link": "前往下载"
+      }
+    },
+    "messages": {
+      "loading": "加载中...",
+      "loadFailed": "加载配置失败",
+      "updated": "默认终端已更新",
+      "saveFailed": "保存配置失败",
+      "refreshed": "已刷新可用终端列表"
+    }
+  }
+}
diff --git a/src/web-ui/src/locales/zh-CN/settings/debug.json b/src/web-ui/src/locales/zh-CN/settings/debug.json
index 1dd49c5e..24de612e 100644
--- a/src/web-ui/src/locales/zh-CN/settings/debug.json
+++ b/src/web-ui/src/locales/zh-CN/settings/debug.json
@@ -2,7 +2,9 @@
   "title": "调试配置",
   "subtitle": "日志和语言调试模板配置",
   "sections": {
-    "settings": "基础设置",
+    "combined": "调试模式设置",
+    "combinedDescription": "配置调试Agent的日志路径、Ingest 服务端口，以及各语言的代码插桩模板。",
+    "settings": "调试设置",
     "templates": "语言调试模板"
   },
   "languageLabels": {
@@ -39,6 +41,7 @@
       "endPlaceholder": "结束标记"
     },
     "notes": "注意事项",
+    "configure": "配置模板",
     "reset": "重置为默认模板",
     "noteItems": {
       "javascript": {
diff --git a/src/web-ui/src/locales/zh-CN/settings/logging.json b/src/web-ui/src/locales/zh-CN/settings/logging.json
deleted file mode 100644
index 67dabe2a..00000000
--- a/src/web-ui/src/locales/zh-CN/settings/logging.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "title": "日志",
-  "subtitle": "运行时日志级别与本次启动日志路径",
-  "sections": {
-    "level": "日志级别",
-    "path": "本次启动日志路径"
-  },
-  "level": {
-    "description": "实时控制日志输出级别，修改后立即生效。"
-  },
-  "levels": {
-    "trace": "Trace",
-    "debug": "Debug",
-    "info": "Info",
-    "warn": "Warn",
-    "error": "Error",
-    "off": "Off"
-  },
-  "actions": {
-    "refreshTooltip": "刷新运行时状态",
-    "openFolder": "打开文件夹",
-    "openFolderTooltip": "在文件管理器中打开日志文件夹"
-  },
-  "messages": {
-    "loading": "加载中...",
-    "loadFailed": "加载日志配置失败",
-    "saveFailed": "保存日志级别失败",
-    "levelUpdated": "日志级别已更新",
-    "refreshed": "运行时状态已刷新",
-    "openedFolder": "日志文件夹已打开",
-    "openFailed": "打开日志文件夹失败",
-    "pathUnavailable": "日志文件夹路径不可用"
-  }
-}
diff --git a/src/web-ui/src/locales/zh-CN/settings/mcp-tools.json b/src/web-ui/src/locales/zh-CN/settings/mcp-tools.json
index 85ddcbbf..14fd31a0 100644
--- a/src/web-ui/src/locales/zh-CN/settings/mcp-tools.json
+++ b/src/web-ui/src/locales/zh-CN/settings/mcp-tools.json
@@ -1,4 +1,4 @@
 {
-  "title": "MCP & 工具",
-  "subtitle": "管理 MCP 服务与工具执行行为"
+  "title": "MCP",
+  "subtitle": "管理 MCP 服务与 JSON 配置"
 }
diff --git a/src/web-ui/src/locales/zh-CN/settings/session-config.json b/src/web-ui/src/locales/zh-CN/settings/session-config.json
index 8237cbd8..6ea4512d 100644
--- a/src/web-ui/src/locales/zh-CN/settings/session-config.json
+++ b/src/web-ui/src/locales/zh-CN/settings/session-config.json
@@ -1,30 +1,17 @@
 {
   "title": "会话配置",
-  "subtitle": "配置会话创建行为与智能功能",
-  "sections": {
-    "defaultMode": {
-      "title": "新建会话默认模式",
-      "description": "点击导航栏「新建会话」按钮时，默认创建哪种类型的会话",
-      "code": "Code",
-      "codeDesc": "标准 AI 编程会话，支持代码生成、调试与工具调用",
-      "cowork": "Cowork",
-      "coworkDesc": "协作会话，适合多方参与的协同工作场景"
-    },
-    "smartFeatures": {
-      "title": "智能特性"
-    }
-  },
+  "subtitle": "会话相关 AI 功能与工具执行行为",
   "features": {
     "sessionTitle": {
       "title": "会话标题自动生成",
       "subtitle": "新对话时 AI 自动生成简洁标题",
       "warning": "会话标题将使用用户消息的前 20 个字符"
-    },
-    "welcomeAnalysis": {
-      "title": "欢迎页智能分析",
-      "subtitle": "分析工作状态并提供操作建议"
     }
   },
+  "toolExecution": {
+    "sectionTitle": "工具执行行为",
+    "sectionDescription": "本会话中 AI 调用工具时的确认与超时策略。"
+  },
   "model": {
     "label": "模型",
     "primary": "主力模型",
diff --git a/src/web-ui/src/locales/zh-CN/settings/terminal.json b/src/web-ui/src/locales/zh-CN/settings/terminal.json
deleted file mode 100644
index e59f3564..00000000
--- a/src/web-ui/src/locales/zh-CN/settings/terminal.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "title": "终端",
-  "subtitle": "终端配置",
-  "sections": {
-    "defaultTerminal": "默认终端"
-  },
-  "terminal": {
-    "refreshTooltip": "刷新可用终端列表",
-    "autoDetect": "自动检测 (推荐)",
-    "description": "新建终端时使用的默认 Shell 类型",
-    "placeholder": "选择默认终端",
-    "noShells": "未检测到可用的终端",
-    "warnings": {
-      "cmd": "CMD 不支持 Shell 集成，AI 命令将通过 PowerShell 执行。",
-      "gitBash": "Git Bash 安装 oh-my-zsh 后可能导致 Shell 集成失效，如遇异常建议切换至 PowerShell。"
-    }
-  },
-  "recommendations": {
-    "pwsh": {
-      "prefix": "推荐安装使用",
-      "name": "PowerShell Core",
-      "suffix": "以获得更好的跨平台体验和现代化功能",
-      "link": "前往下载"
-    }
-  },
-  "messages": {
-    "loading": "加载中...",
-    "loadFailed": "加载配置失败",
-    "updated": "默认终端已更新",
-    "saveFailed": "保存配置失败",
-    "refreshed": "已刷新可用终端列表"
-  }
-}
diff --git a/src/web-ui/src/locales/zh-CN/settings/theme.json b/src/web-ui/src/locales/zh-CN/settings/theme.json
deleted file mode 100644
index cfa7706a..00000000
--- a/src/web-ui/src/locales/zh-CN/settings/theme.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "theme": {
-    "title": "外观",
-    "subtitle": "主题和语言设置",
-    "language": "语言",
-    "themes": "主题",
-    "importTheme": "导入主题",
-    "importing": "导入中...",
-    "builtIn": "内置",
-    "custom": "自定义",
-    "export": "导出",
-    "delete": "删除",
-    "confirmDelete": "确定删除主题 \"{{name}}\" 吗？",
-    "importSuccess": "主题导入成功！",
-    "importFailed": "主题导入失败，请检查文件格式。",
-    "languageSectionHint": "配置界面显示语言。",
-    "languageRowHint": "选择一个语言包作为当前界面语言。",
-    "themeSectionHint": "选择、导入、导出或管理视觉主题。",
-    "themeRowHint": "选择已安装的主题或管理自定义主题。",
-    "presets": {
-      "bitfun-dark": {
-        "name": "暗色",
-        "description": "默认暗色主题"
-      },
-      "bitfun-light": {
-        "name": "亮色",
-        "description": "亮色主题 - 素雅高级，淡蓝灰调"
-      },
-      "bitfun-midnight": {
-        "name": "午夜",
-        "description": "午夜灰暗色主题 - 专业优雅，灵感来自 JetBrains IDE"
-      },
-      "bitfun-china-style": {
-        "name": "墨韵",
-        "description": "中国风主题 - 宣纸墨香，青花朱砂，温润典雅"
-      },
-      "bitfun-china-night": {
-        "name": "墨夜",
-        "description": "中国风暗色主题 - 墨夜星辰，月华如水，沉静典雅"
-      },
-      "bitfun-cyber": {
-        "name": "赛博",
-        "description": "科技感主题 - 深邃黑洞，霓虹未来，极致科技美学"
-      },
-      "bitfun-slate": {
-        "name": "石板灰",
-        "description": "石板灰几何主题 - 极深沉浸，高对比度灰度美学"
-      }
-    }
-  }
-}
diff --git a/src/web-ui/src/shared/services/ide-control/api.ts b/src/web-ui/src/shared/services/ide-control/api.ts
index 7b31bff9..f6e04f77 100644
--- a/src/web-ui/src/shared/services/ide-control/api.ts
+++ b/src/web-ui/src/shared/services/ide-control/api.ts
@@ -14,6 +14,8 @@ import {
 } from './types';
 import { PanelContent, TabData } from '@/app/components/panels/base/types';
 import type { LineRange } from '@/component-library/components/Markdown';
+import { normalizeSettingsTab } from '@/app/scenes/settings/settingsConfig';
+
 const panelController = new PanelController();
 
  
@@ -240,7 +242,7 @@ export const quickActions = {
   openSettings: (section?: string) => {
     import('@/app/scenes/settings/settingsStore').then(({ useSettingsStore }) => {
       if (section) {
-        useSettingsStore.getState().setActiveTab(section as import('@/app/scenes/settings/settingsConfig').ConfigTab);
+        useSettingsStore.getState().setActiveTab(normalizeSettingsTab(section));
       }
     });
     window.dispatchEvent(new CustomEvent('scene:open', { detail: { sceneId: 'settings' } }));
diff --git a/tests/e2e/specs/l0-i18n.spec.ts b/tests/e2e/specs/l0-i18n.spec.ts
index 262b9021..e7c86411 100644
--- a/tests/e2e/specs/l0-i18n.spec.ts
+++ b/tests/e2e/specs/l0-i18n.spec.ts
@@ -76,23 +76,22 @@ describe('L0 Internationalization', () => {
       await settingsItem!.click();
       await browser.pause(2000);
 
-      // Navigate to theme tab (language selector is in theme config)
+      // Navigate to Basics tab (language selector lives there)
       const navItems = await $$('.bitfun-settings-nav__item');
       console.log(`[L0] Found ${navItems.length} settings nav items`);
 
-      let themeTab = null;
+      let basicsTab = null;
       for (const item of navItems) {
         const text = await item.getText();
-        // Theme tab is labeled "外观" (Appearance) in Chinese
-        if (text.includes('外观') || text.toLowerCase().includes('theme') || text.includes('主题')) {
-          themeTab = item;
-          console.log(`[L0] Found theme tab: "${text}"`);
+        if (text.includes('基础') || text.toLowerCase().includes('basics')) {
+          basicsTab = item;
+          console.log(`[L0] Found basics tab: "${text}"`);
           break;
         }
       }
 
-      if (themeTab) {
-        await themeTab.click();
+      if (basicsTab) {
+        await basicsTab.click();
         await browser.pause(2000); // Wait for lazy load
       }
 
diff --git a/tests/e2e/specs/l0-theme.spec.ts b/tests/e2e/specs/l0-theme.spec.ts
index 4020fb6b..4c206040 100644
--- a/tests/e2e/specs/l0-theme.spec.ts
+++ b/tests/e2e/specs/l0-theme.spec.ts
@@ -96,23 +96,22 @@ describe('L0 Theme', () => {
       await settingsItem!.click();
       await browser.pause(2000);
 
-      // Navigate to theme tab (settings opens to models tab by default)
+      // Navigate to Basics tab (language + theme + logging; settings opens to models by default)
       const navItems = await $$('.bitfun-settings-nav__item');
       console.log(`[L0] Found ${navItems.length} settings nav items`);
 
-      let themeTab = null;
+      let basicsTab = null;
       for (const item of navItems) {
         const text = await item.getText();
-        // Theme tab is labeled "外观" (Appearance) in Chinese
-        if (text.includes('外观') || text.toLowerCase().includes('theme') || text.includes('主题')) {
-          themeTab = item;
-          console.log(`[L0] Found theme tab: "${text}"`);
+        if (text.includes('基础') || text.toLowerCase().includes('basics')) {
+          basicsTab = item;
+          console.log(`[L0] Found basics tab: "${text}"`);
           break;
         }
       }
 
-      if (themeTab) {
-        await themeTab.click();
+      if (basicsTab) {
+        await basicsTab.click();
         await browser.pause(2000); // Wait for lazy load
       }