diff --git a/src/AxCopilot/Views/SettingsWindow.AiToggle.cs b/src/AxCopilot/Views/SettingsWindow.AiToggle.cs
index ecdea59..2a9317e 100644
--- a/src/AxCopilot/Views/SettingsWindow.AiToggle.cs
+++ b/src/AxCopilot/Views/SettingsWindow.AiToggle.cs
@@ -19,9 +19,12 @@ public partial class SettingsWindow
         {
             AiEnabledToggle.IsChecked = enabled;
         }
-        // AX Agent 탭 가시성
+        // AgentTabItem은 항상 숨김 — 설정은 ChatWindow 내 AgentSettingsPanel에서
         if (AgentTabItem != null)
-            AgentTabItem.Visibility = enabled ? Visibility.Visible : Visibility.Collapsed;
+            AgentTabItem.Visibility = Visibility.Collapsed;
+        // 고급 에이전트 탭: AI 활성화 여부에 따라 표시
+        if (AdvancedAgentTabItem != null)
+            AdvancedAgentTabItem.Visibility = enabled ? Visibility.Visible : Visibility.Collapsed;
     }
 
     private void AiEnabled_Changed(object sender, RoutedEventArgs e)
diff --git a/src/AxCopilot/Views/SettingsWindow.xaml b/src/AxCopilot/Views/SettingsWindow.xaml
index 01e4064..cacf29a 100644
--- a/src/AxCopilot/Views/SettingsWindow.xaml
+++ b/src/AxCopilot/Views/SettingsWindow.xaml
@@ -3252,10 +3252,60 @@
                 </Grid>
             </TabItem>
 
+            <!-- ═══════════════════════════════════════════════════════════════ -->
+            <!-- 고급 에이전트 설정 탭 (MCP/훅/권한 전문 설정)                     -->
+            <!-- ═══════════════════════════════════════════════════════════════ -->
+            <TabItem x:Name="AdvancedAgentTabItem" Header="고급 에이전트" Tag="&#xE8EF;" Style="{StaticResource SideNavItem}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- 안내 배너 -->
+                    <Border Grid.Row="0" Background="{DynamicResource ItemBackground}"
+                            CornerRadius="8" Margin="20,16,20,0" Padding="14,10">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="&#xE8BD;" FontFamily="Segoe MDL2 Assets" FontSize="16"
+                                       Foreground="{DynamicResource AccentColor}" VerticalAlignment="Center"/>
+                            <StackPanel Margin="10,0,0,0">
+                                <TextBlock Text="기본 에이전트 설정은 채팅 화면에서"
+                                           FontSize="13" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource PrimaryText}"/>
+                                <TextBlock Text="AX Agent 채팅 창의 ⚙ 아이콘을 클릭하면 모델·반복횟수·도구 등을 바로 설정할 수 있습니다."
+                                           FontSize="11" Foreground="{DynamicResource SecondaryText}"
+                                           TextWrapping="Wrap" Margin="0,2,0,0"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+
+                    <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto"
+                                  HorizontalScrollBarVisibility="Disabled">
+                        <StackPanel Margin="20,16,20,20">
+
+                            <!-- MCP 서버 등록 안내 -->
+                            <TextBlock Text="MCP 서버 등록" FontSize="15" FontWeight="SemiBold"
+                                       Foreground="{DynamicResource PrimaryText}" Margin="0,0,0,8"/>
+                            <TextBlock Text="외부 도구 연결(MCP 서버) 등록/삭제는 AX Agent 탭(개발자 모드 ON)에서 가능합니다. 기본 설정은 채팅 화면 ⚙ 패널의 MCP 섹션을 이용하세요."
+                                       FontSize="12" Foreground="{DynamicResource SecondaryText}"
+                                       TextWrapping="Wrap" Margin="0,0,0,16"/>
+
+                            <!-- 훅/권한 규칙 안내 -->
+                            <TextBlock Text="훅 · 권한 규칙 편집" FontSize="15" FontWeight="SemiBold"
+                                       Foreground="{DynamicResource PrimaryText}" Margin="0,0,0,8"/>
+                            <TextBlock Text="훅 스크립트 및 권한 패턴 규칙은 개발자 모드를 활성화한 후 AX Agent 탭 고급 설정에서 편집할 수 있습니다."
+                                       FontSize="12" Foreground="{DynamicResource SecondaryText}"
+                                       TextWrapping="Wrap" Margin="0,0,0,16"/>
+
+                        </StackPanel>
+                    </ScrollViewer>
+                </Grid>
+            </TabItem>
+
             <!-- ═════════════════════════════════════════════════════════════ -->
-            <!-- AX Agent 탭                                                    -->
+            <!-- AX Agent 탭 (숨김 — 설정은 ChatWindow 내 AgentSettingsPanel로 이관) -->
             <!-- ═════════════════════════════════════════════════════════════ -->
-            <TabItem x:Name="AgentTabItem" Header="AX Agent" Tag="&#xE8BD;" Style="{StaticResource SideNavItem}">
+            <TabItem x:Name="AgentTabItem" Header="AX Agent" Tag="&#xE8BD;" Style="{StaticResource SideNavItem}" Visibility="Collapsed">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>