From 500c8ffb06977ffa38fbcde820cd12e06b6a96a6 Mon Sep 17 00:00:00 2001
From: lacvet <samsungdisplay@kakao.com>
Date: Sun, 5 Apr 2026 16:39:32 +0900
Subject: [PATCH] =?UTF-8?q?AX=20Agent=20=EC=A2=8C=EC=B8=A1=20=ED=8C=A8?=
 =?UTF-8?q?=EB=84=90=EA=B3=BC=20=EC=BB=A8=ED=85=8D=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=9F=89=20UI=EB=A5=BC=20Codex=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EC=9E=AC=EC=A0=95=EB=A0=AC\n\n-?=
 =?UTF-8?q?=20=EC=A2=8C=EC=B8=A1=20=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B0=94=20?=
 =?UTF-8?q?=ED=8F=AD=EA=B3=BC=20=EC=83=88=20=EB=8C=80=ED=99=94/=EA=B2=80?=
 =?UTF-8?q?=EC=83=89/=ED=95=84=ED=84=B0/=ED=83=AD=20=EB=A9=94=EB=89=B4=20?=
 =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8F=AC=EB=A5=BC=20=ED=82=A4=EC=9B=8C=20?=
 =?UTF-8?q?=EB=A0=88=ED=8D=BC=EB=9F=B0=EC=8A=A4=EC=99=80=20=EB=8D=94=20?=
 =?UTF-8?q?=EB=B9=84=EC=8A=B7=ED=95=9C=20=EB=B0=80=EB=8F=84=EB=A1=9C=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95\n-=20Cowork=20=EC=9E=91=EC=97=85=20=EC=9C=A0?=
 =?UTF-8?q?=ED=98=95=20=EC=B9=B4=EB=93=9C=20=ED=81=AC=EA=B8=B0=EC=99=80=20?=
 =?UTF-8?q?=EC=A0=9C=EB=AA=A9/hover=20=EC=84=A4=EB=AA=85=20=EB=9D=BC?=
 =?UTF-8?q?=EB=B2=A8=20=ED=8F=B0=ED=8A=B8=EB=A5=BC=20=ED=99=95=EB=8C=80?=
 =?UTF-8?q?=ED=95=B4=20=EA=B0=80=EB=8F=85=EC=84=B1=20=EB=B3=B4=EC=A0=95\n-?=
 =?UTF-8?q?=20=ED=95=98=EB=8B=A8=20=EC=BB=A8=ED=85=8D=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=9F=89=20=EC=B9=B4=EB=93=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9E=91=EC=9D=80=20=EC=9B=90=ED=98=95=20=EC=8B=AC=EB=B3=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B6=95=EC=86=8C=ED=95=98=EA=B3=A0=20hover=20?=
 =?UTF-8?q?=EC=A0=84=EC=9A=A9=20=EC=BB=A4=EC=8A=A4=ED=85=80=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=EC=9C=BC=EB=A1=9C=20=EC=83=81=EC=84=B8=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B6=84=EB=A6=AC\n-=20README=EC=99=80=20DEVELOPME?=
 =?UTF-8?q?NT=20=EB=AC=B8=EC=84=9C=EC=97=90=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EB=B0=8F=20=EA=B2=80=EC=A6=9D=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20=EC=A6=89=EC=8B=9C=20=EB=B0=98=EC=98=81\n\n?=
 =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EA=B2=B0=EA=B3=BC\n-=20dotnet=20build=20s?=
 =?UTF-8?q?rc/AxCopilot/AxCopilot.csproj=20-c=20Release=20-v=20minimal=20-?=
 =?UTF-8?q?p:OutputPath=3Dbin\\verify\\=20-p:IntermediateOutputPath=3Dobj\?=
 =?UTF-8?q?\verify\\\n-=20=EA=B2=BD=EA=B3=A0=200=20/=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              |   5 +
 docs/DEVELOPMENT.md                    |   6 +
 src/AxCopilot/Views/ChatWindow.xaml    | 185 +++++++++++++++----------
 src/AxCopilot/Views/ChatWindow.xaml.cs | 109 +++++++++++----
 4 files changed, 209 insertions(+), 96 deletions(-)

diff --git a/README.md b/README.md
index 2da0569..15699b2 100644
--- a/README.md
+++ b/README.md
@@ -902,6 +902,11 @@ ow + toggle 시각 언어로 통일했습니다.
 - `AgentEventType.Planning` 도 더 `claw-code`처럼 기본 transcript에서는 큰 계획 카드 대신 얇은 compact pill만 남기도록 바꿨습니다. 이제 debug가 아니면 계획이 카드 형태로 본문을 밀어내지 않습니다.
 - 검증: `dotnet build src/AxCopilot/AxCopilot.csproj -c Release -v minimal -p:OutputPath=bin\\verify\\ -p:IntermediateOutputPath=obj\\verify\\` 경고 0 / 오류 0
 - 업데이트: 2026-04-05 19:24 (KST)
+- AX Agent 좌측 패널과 작업 유형 카드의 크기를 다시 키웠습니다. [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml) 에서 사이드바 폭을 `246`으로 넓히고 `새 대화`, `검색`, 필터 드롭다운, 탭별 메뉴의 폰트/패딩/아이콘을 전반적으로 키워 첫 번째 레퍼런스 이미지처럼 더 읽기 쉽게 정리했습니다.
+- [ChatWindow.xaml.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml.cs) 의 `BuildTopicButtons()` 에서는 작업 유형 카드 크기를 `148 x 124`로 늘리고, 아이콘 원형과 제목·hover 설명 라벨 폰트도 함께 키워 현재 화면 글자 크기가 너무 작게 보이던 문제를 보정했습니다.
+- 하단 컨텍스트 사용량 UI도 카드형에서 심볼형으로 바꿨습니다. [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml) 의 `TokenUsageCard` 는 작은 원형 심볼만 남기고, 상세 정보는 `TokenUsagePopup` 커스텀 팝업으로 분리했습니다. [ChatWindow.xaml.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml.cs) 에서는 hover 진입/이탈 시 팝업을 제어하고, `RefreshContextUsageVisual()` 이 심볼 상태와 팝업 텍스트를 함께 갱신하도록 연결했습니다.
+- 검증: `dotnet build src/AxCopilot/AxCopilot.csproj -c Release -v minimal -p:OutputPath=bin\\verify\\ -p:IntermediateOutputPath=obj\\verify\\` 경고 0 / 오류 0
+- 업데이트: 2026-04-05 19:38 (KST)
 
 ---
 
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 59927cb..32d9a63 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -4662,3 +4662,9 @@ ow + toggle ?쒓컖 ?몄뼱濡??ㅼ떆 ?뺣젹?덈떎.
 - `AddAgentEventBanner(...)` 의 Planning 처리도 바꿨습니다. 이제 `AgentEventType.Planning` 은 log level과 무관하게 기본 transcript에 compact pill만 남기고, 큰 계획 카드는 기본 흐름에서 사용하지 않습니다. `claw-code`처럼 transcript 중심 읽기 흐름을 유지하기 위한 정리입니다.
 - 검증: `dotnet build src/AxCopilot/AxCopilot.csproj -c Release -v minimal -p:OutputPath=bin\verify\ -p:IntermediateOutputPath=obj\verify\` 경고 0 / 오류 0
 - 업데이트: 2026-04-05 19:24 (KST)
+- AX Agent 레이아웃 타이포를 사용자 피드백 기준으로 다시 키웠습니다. [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml) 에서 `SidebarColumn` 폭을 `246`으로 넓히고, `SidebarNewChatTrigger`, `SidebarSearchTrigger`, `SidebarSearchEditor`, `BtnCategoryDrop`, `SidebarChatMenu`, `SidebarCoworkMenu`, `SidebarCodeMenu` 의 폰트/패딩/아이콘 크기를 한 단계 올렸습니다. 첫 번째 레퍼런스처럼 좌측 패널이 너무 작아 보이지 않도록 보정한 변경입니다.
+- 같은 파일에서 `EmptyStateTitle`, `EmptyStateDesc` 를 `22 / 14.25` 기준으로 키우고 하단 `TokenUsageCard` 를 작은 원형 심볼형으로 교체했습니다. 기존 summary/hint/button 텍스트는 기본 노출에서 제거했고, `TokenUsagePopup` 을 새로 추가해 hover 시에만 컨텍스트 상태를 보여주게 했습니다.
+- [ChatWindow.xaml.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml.cs)의 `BuildTopicButtons()` 는 작업 유형 카드 크기를 `148 x 124`로 키우고, 아이콘 원형/제목/hover 설명 라벨 폰트를 함께 올려 현재 Cowork 첫 화면 글자 크기가 지나치게 작게 보이던 문제를 보정했습니다.
+- 같은 파일에 `_tokenUsagePopupCloseTimer`, `TokenUsageCard_MouseEnter/Leave`, `TokenUsagePopup_MouseEnter/Leave` 를 추가했고, `RefreshContextUsageVisual()` 은 이제 카드 텍스트 대신 popup 전용 타이틀/요약/압축 안내 텍스트를 갱신합니다. 기본 WPF 툴팁 문자열은 제거해 `Codex` 쪽의 아이콘 + hover 상세 구조에 더 가깝게 맞췄습니다.
+- 검증: `dotnet build src/AxCopilot/AxCopilot.csproj -c Release -v minimal -p:OutputPath=bin\verify\ -p:IntermediateOutputPath=obj\verify\` 경고 0 / 오류 0
+- 업데이트: 2026-04-05 19:38 (KST)
diff --git a/src/AxCopilot/Views/ChatWindow.xaml b/src/AxCopilot/Views/ChatWindow.xaml
index 6dc4070..cc1ec2a 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml
+++ b/src/AxCopilot/Views/ChatWindow.xaml
@@ -412,7 +412,7 @@
                 <!-- 축소 아이콘 바 (사이드바 닫힘 시 표시) -->
                 <ColumnDefinition x:Name="IconBarColumn" Width="0"/>
                 <!-- 사이드바 (열림 시 표시) -->
-                <ColumnDefinition x:Name="SidebarColumn" Width="220" MinWidth="0"/>
+                <ColumnDefinition x:Name="SidebarColumn" Width="246" MinWidth="0"/>
                 <ColumnDefinition Width="*"/>
                 <!-- 미리보기 스플리터 -->
                 <ColumnDefinition x:Name="SplitterColumn" Width="0"/>
@@ -506,8 +506,8 @@
                         <StackPanel>
                             <Border x:Name="SidebarNewChatTrigger"
                                     Background="Transparent"
-                                    CornerRadius="5"
-                                    Padding="6,4"
+                                    CornerRadius="7"
+                                    Padding="8,6"
                                     Cursor="Hand"
                                     MouseEnter="SidebarNewChatTrigger_MouseEnter"
                                     MouseLeave="SidebarNewChatTrigger_MouseLeave"
@@ -518,25 +518,25 @@
                                         <ColumnDefinition Width="*"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="9.75"
+                                    <TextBlock Text="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="11.5"
                                                Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     <TextBlock Grid.Column="1" Text="새 대화"
                                                Foreground="{DynamicResource PrimaryText}"
-                                               FontSize="10" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                                               FontSize="12.5" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                                     <TextBlock x:Name="SidebarNewChatShortcutHint"
                                                Grid.Column="2"
                                                Text="Ctrl+N"
                                                Visibility="Collapsed"
                                                Foreground="{DynamicResource SecondaryText}"
-                                               FontSize="9.25"
+                                               FontSize="10.5"
                                                VerticalAlignment="Center"/>
                                 </Grid>
                             </Border>
 
                             <Border x:Name="SidebarSearchTrigger"
                                     Background="Transparent"
-                                    CornerRadius="5"
-                                    Padding="6,4"
+                                    CornerRadius="7"
+                                    Padding="8,6"
                                     Cursor="Hand"
                                     MouseEnter="SidebarSearchTrigger_MouseEnter"
                                     MouseLeave="SidebarSearchTrigger_MouseLeave"
@@ -547,17 +547,17 @@
                                         <ColumnDefinition Width="*"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="9.75"
+                                    <TextBlock Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="11.5"
                                                Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     <TextBlock Grid.Column="1" Text="검색"
                                                Foreground="{DynamicResource PrimaryText}"
-                                               FontSize="10" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                                               FontSize="12.5" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                                     <TextBlock x:Name="SidebarSearchShortcutHint"
                                                Grid.Column="2"
                                                Text="Ctrl+K"
                                                Visibility="Collapsed"
                                                Foreground="{DynamicResource SecondaryText}"
-                                               FontSize="9.25"
+                                               FontSize="10.5"
                                                VerticalAlignment="Center"/>
                                 </Grid>
                             </Border>
@@ -565,7 +565,7 @@
                             <Border x:Name="SidebarSearchEditor"
                                     Background="{DynamicResource ItemBackground}"
                                     CornerRadius="7"
-                                    Padding="7,4"
+                                    Padding="9,6"
                                     Visibility="Collapsed"
                                     Opacity="0"
                                     RenderTransformOrigin="0,0.5">
@@ -580,35 +580,35 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="11"
+                                    <TextBlock Text="&#xE721;" FontFamily="Segoe MDL2 Assets" FontSize="12.5"
                                                Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     <TextBox x:Name="SearchBox" Grid.Column="1"
                                              Background="Transparent" BorderThickness="0"
                                              Foreground="{DynamicResource PrimaryText}"
-                                             CaretBrush="{DynamicResource AccentColor}" FontSize="10.5"
-                                             VerticalAlignment="Center" Margin="8,0,6,0"
+                                             CaretBrush="{DynamicResource AccentColor}" FontSize="12.5"
+                                             VerticalAlignment="Center" Margin="9,0,7,0"
                                              TextChanged="SearchBox_TextChanged"/>
                                     <Button x:Name="BtnConversationSort" Grid.Column="2"
                                             Style="{StaticResource GhostBtn}"
-                                            Padding="6,2.5" MinWidth="50"
+                                            Padding="7,3.5" MinWidth="58"
                                             Margin="0,0,0,0"
                                             VerticalAlignment="Center"
                                             Click="BtnConversationSort_Click"
                                             ToolTip="대화 정렬 기준 전환"
                                             Visibility="Collapsed">
                                         <StackPanel Orientation="Horizontal">
-                                            <TextBlock Text="&#xE8CB;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                            <TextBlock Text="&#xE8CB;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                        Foreground="{DynamicResource SecondaryText}"
                                                        VerticalAlignment="Center" Margin="0,0,4,0"/>
                                             <TextBlock x:Name="ConversationSortLabel" Text="활동"
-                                                       FontSize="10" FontWeight="SemiBold"
+                                                       FontSize="11.5" FontWeight="SemiBold"
                                                        Foreground="{DynamicResource SecondaryText}"
                                                        VerticalAlignment="Center"/>
                                             </StackPanel>
                                     </Button>
                                     <Button x:Name="BtnRunningOnlyFilter" Grid.Column="3"
                                             Style="{StaticResource GhostBtn}"
-                                            Padding="6,2.5" MinWidth="50"
+                                            Padding="7,3.5" MinWidth="58"
                                             Margin="5,0,0,0"
                                             VerticalAlignment="Center"
                                             Click="BtnRunningOnlyFilter_Click"
@@ -616,24 +616,24 @@
                                             Visibility="Collapsed"
                                             IsEnabled="False">
                                         <StackPanel Orientation="Horizontal">
-                                            <TextBlock Text="&#xE768;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                            <TextBlock Text="&#xE768;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                        Foreground="{DynamicResource SecondaryText}"
                                                        VerticalAlignment="Center" Margin="0,0,4,0"/>
                                             <TextBlock x:Name="RunningOnlyFilterLabel" Text="진행"
-                                                       FontSize="10" FontWeight="SemiBold"
+                                                       FontSize="11.5" FontWeight="SemiBold"
                                                        Foreground="{DynamicResource SecondaryText}"
                                                        VerticalAlignment="Center"/>
                                         </StackPanel>
                                     </Button>
                                     <Button Grid.Column="4"
                                             Style="{StaticResource GhostBtn}"
-                                            Padding="6,3"
+                                            Padding="7,4"
                                             Margin="5,0,0,0"
                                             Click="BtnSidebarSearchClose_Click"
                                             ToolTip="검색 닫기">
                                         <TextBlock Text="&#xE711;"
                                                    FontFamily="Segoe MDL2 Assets"
-                                                   FontSize="9.75"
+                                                   FontSize="10.5"
                                                    Foreground="{DynamicResource SecondaryText}"/>
                                     </Button>
                                 </Grid>
@@ -644,20 +644,20 @@
                     <!-- 상단 필터 드롭다운 -->
                     <Border Grid.Row="2" Margin="12,0,12,4">
                         <Button x:Name="BtnCategoryDrop" Style="{StaticResource GhostBtn}"
-                                HorizontalAlignment="Stretch" Padding="7,3.5"
+                                HorizontalAlignment="Stretch" Padding="9,5"
                                 Click="BtnCategoryDrop_Click">
                             <Grid HorizontalAlignment="Stretch">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock x:Name="CategoryIcon" Text="&#xE8BD;"
-                                               FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                               FontFamily="Segoe MDL2 Assets" FontSize="11.5"
                                                Foreground="{DynamicResource AccentColor}"
-                                               VerticalAlignment="Center" Margin="0,0,6,0"/>
+                                               VerticalAlignment="Center" Margin="0,0,7,0"/>
                                     <TextBlock x:Name="CategoryLabel" Text="모든 주제"
-                                               FontSize="10.25" FontWeight="SemiBold"
+                                               FontSize="12" FontWeight="SemiBold"
                                                Foreground="{DynamicResource PrimaryText}"
                                                VerticalAlignment="Center"/>
                                 </StackPanel>
-                                <TextBlock Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="8.5"
+                                <TextBlock Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="9.5"
                                            Foreground="{DynamicResource SecondaryText}"
                                            HorizontalAlignment="Right" VerticalAlignment="Center"/>
                             </Grid>
@@ -674,18 +674,18 @@
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Margin="0,0,0,4" Visibility="Collapsed">
                                 <TextBlock x:Name="SidebarModeBadgeIcon" Text="&#xE8BD;"
-                                           FontFamily="Segoe MDL2 Assets" FontSize="10.5"
+                                           FontFamily="Segoe MDL2 Assets" FontSize="11.5"
                                            Foreground="{DynamicResource AccentColor}"
                                            VerticalAlignment="Center" Margin="0,0,6,0"/>
                                 <TextBlock x:Name="SidebarModeBadgeTitle" Text="Chat 메뉴"
-                                           FontSize="10.5" FontWeight="SemiBold"
+                                           FontSize="11.75" FontWeight="SemiBold"
                                            Foreground="{DynamicResource PrimaryText}"
                                            VerticalAlignment="Center"/>
                             </StackPanel>
 
                             <StackPanel x:Name="SidebarChatMenu" Visibility="Visible">
                                 <Border Cursor="Hand" Background="Transparent" CornerRadius="8"
-                                        Padding="7,3.5" Margin="0,0,0,2"
+                                        Padding="9,5" Margin="0,0,0,3"
                                         MouseLeftButtonUp="SidebarChatAll_MouseLeftButtonUp">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -693,17 +693,17 @@
                                             <ColumnDefinition Width="*"/>
                                             <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="&#xE8BD;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                        <TextBlock Text="&#xE8BD;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                    Foreground="{DynamicResource AccentColor}" VerticalAlignment="Center"/>
                                         <TextBlock Grid.Column="1" Text="주제"
                                                    Foreground="{DynamicResource PrimaryText}"
-                                                   FontSize="10.25" Margin="6,0,0,0" VerticalAlignment="Center"/>
-                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="8.5"
+                                                   FontSize="12" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="9.5"
                                                    Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     </Grid>
                                 </Border>
                                 <Border x:Name="SidebarChatRunningRow" Cursor="Hand" Background="Transparent" CornerRadius="8"
-                                        Padding="7,3.5"
+                                        Padding="9,5"
                                         MouseLeftButtonUp="SidebarChatRunning_MouseLeftButtonUp"
                                         Visibility="Collapsed">
                                     <Grid>
@@ -712,21 +712,21 @@
                                             <ColumnDefinition Width="*"/>
                                             <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="&#xE768;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                        <TextBlock Text="&#xE768;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                    Foreground="#22C55E" VerticalAlignment="Center"/>
                                         <TextBlock Grid.Column="1" Text="진행 중 대화만 보기"
                                                    Foreground="{DynamicResource PrimaryText}"
-                                                   FontSize="10.25" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                                                   FontSize="12" Margin="7,0,0,0" VerticalAlignment="Center"/>
                                         <TextBlock Grid.Column="2" x:Name="SidebarChatRunningState" Text="OFF"
                                                    Foreground="{DynamicResource SecondaryText}"
-                                                   FontSize="9.75" VerticalAlignment="Center"/>
+                                                   FontSize="10.75" VerticalAlignment="Center"/>
                                     </Grid>
                                 </Border>
                             </StackPanel>
 
                             <StackPanel x:Name="SidebarCoworkMenu" Visibility="Collapsed">
                                 <Border Cursor="Hand" Background="Transparent" CornerRadius="8"
-                                        Padding="7,3.5" Margin="0,0,0,2"
+                                        Padding="9,5" Margin="0,0,0,3"
                                         MouseLeftButtonUp="SidebarCoworkCategory_MouseLeftButtonUp">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -734,12 +734,12 @@
                                             <ColumnDefinition Width="*"/>
                                             <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="&#xE8FD;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                        <TextBlock Text="&#xE8FD;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                    Foreground="#3B82F6" VerticalAlignment="Center"/>
                                         <TextBlock Grid.Column="1" Text="작업 유형"
                                                    Foreground="{DynamicResource PrimaryText}"
-                                                   FontSize="10.25" Margin="6,0,0,0" VerticalAlignment="Center"/>
-                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="8.5"
+                                                   FontSize="12" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="9.5"
                                                    Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     </Grid>
                                 </Border>
@@ -747,7 +747,7 @@
 
                             <StackPanel x:Name="SidebarCodeMenu" Visibility="Collapsed">
                                 <Border Cursor="Hand" Background="Transparent" CornerRadius="8"
-                                        Padding="7,3.5" Margin="0,0,0,2"
+                                        Padding="9,5" Margin="0,0,0,3"
                                         MouseLeftButtonUp="SidebarCodeCategory_MouseLeftButtonUp">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -755,12 +755,12 @@
                                             <ColumnDefinition Width="*"/>
                                             <ColumnDefinition Width="Auto"/>
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="&#xE943;" FontFamily="Segoe MDL2 Assets" FontSize="10"
+                                        <TextBlock Text="&#xE943;" FontFamily="Segoe MDL2 Assets" FontSize="11"
                                                    Foreground="#3B82F6" VerticalAlignment="Center"/>
                                         <TextBlock Grid.Column="1" Text="워크스페이스"
                                                    Foreground="{DynamicResource PrimaryText}"
-                                                   FontSize="10.25" Margin="6,0,0,0" VerticalAlignment="Center"/>
-                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="8.5"
+                                                   FontSize="12" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                                        <TextBlock Grid.Column="2" Text="&#xE70D;" FontFamily="Segoe MDL2 Assets" FontSize="9.5"
                                                    Foreground="{DynamicResource SecondaryText}" VerticalAlignment="Center"/>
                                     </Grid>
                                 </Border>
@@ -1217,14 +1217,14 @@
                                        HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
 
-                        <TextBlock x:Name="EmptyStateTitle" Text="작업을 시작하세요" FontSize="18" FontWeight="SemiBold"
+                        <TextBlock x:Name="EmptyStateTitle" Text="작업을 시작하세요" FontSize="22" FontWeight="SemiBold"
                                    Foreground="{DynamicResource PrimaryText}" HorizontalAlignment="Center"/>
                         <TextBlock x:Name="EmptyStateDesc" Text="프롬프트를 입력하거나 아래 작업 유형을 선택하면 됩니다"
-                                   FontSize="12.5" Foreground="{DynamicResource SecondaryText}"
+                                   FontSize="14.25" Foreground="{DynamicResource SecondaryText}"
                                    HorizontalAlignment="Center"
                                    TextAlignment="Center"
-                                   Width="380"
-                                   Margin="0,5,0,0"/>
+                                   Width="430"
+                                   Margin="0,7,0,0"/>
                     </StackPanel>
 
                     <ScrollViewer x:Name="TopicPresetScrollViewer"
@@ -1692,25 +1692,25 @@
                                     <Border x:Name="TokenUsageCard"
                                             Grid.Column="2"
                                             Margin="6,0,0,0"
-                                            Padding="6,3"
+                                            Padding="0"
+                                            Width="28"
+                                            Height="28"
                                             CornerRadius="999"
-                                            BorderBrush="{DynamicResource BorderColor}"
-                                            BorderThickness="1"
-                                            Background="{DynamicResource ItemBackground}"
+                                            BorderBrush="Transparent"
+                                            BorderThickness="0"
+                                            Background="Transparent"
                                             VerticalAlignment="Center"
-                                            Visibility="Collapsed">
+                                            Visibility="Collapsed"
+                                            Cursor="Hand"
+                                            MouseEnter="TokenUsageCard_MouseEnter"
+                                            MouseLeave="TokenUsageCard_MouseLeave">
                                         <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                            </Grid.ColumnDefinitions>
                                                 <Grid Width="28" Height="28" VerticalAlignment="Center">
                                                 <Ellipse Stroke="{DynamicResource HintBackground}"
-                                                         StrokeThickness="3.5"/>
+                                                         StrokeThickness="3"/>
                                                 <Path x:Name="TokenUsageArc"
                                                       Stroke="{DynamicResource AccentColor}"
-                                                      StrokeThickness="3.5"
+                                                      StrokeThickness="3"
                                                       StrokeStartLineCap="Round"
                                                       StrokeEndLineCap="Round"/>
                                                 <Canvas IsHitTestVisible="False">
@@ -1721,28 +1721,26 @@
                                                 </Canvas>
                                                 <TextBlock x:Name="TokenUsagePercentText"
                                                            Text="0%"
-                                                           FontSize="9"
+                                                           FontSize="8.25"
                                                            FontWeight="SemiBold"
                                                            Foreground="{DynamicResource PrimaryText}"
                                                            HorizontalAlignment="Center"
                                                            VerticalAlignment="Center"/>
                                             </Grid>
-                                            <StackPanel Grid.Column="1"
-                                                        Margin="7,0,5,0"
-                                                        VerticalAlignment="Center">
+                                            <StackPanel Visibility="Collapsed">
                                                 <TextBlock x:Name="TokenUsageSummaryText"
                                                            Text="컨텍스트"
                                                            FontSize="10.5"
                                                            FontWeight="SemiBold"
                                                            Foreground="{DynamicResource PrimaryText}"/>
                                                 <TextBlock x:Name="TokenUsageHintText"
-                                                           Text="0 / 0"
-                                                           FontSize="9"
-                                                           Foreground="{DynamicResource SecondaryText}"/>
+                                                            Text="0 / 0"
+                                                            FontSize="9"
+                                                            Foreground="{DynamicResource SecondaryText}"/>
                                             </StackPanel>
                                             <Button x:Name="BtnCompactNow"
-                                                    Grid.Column="2"
                                                     Style="{StaticResource GhostBtn}"
+                                                    Visibility="Collapsed"
                                                     Padding="6,3"
                                                     Margin="0"
                                                     VerticalAlignment="Center"
@@ -1764,6 +1762,53 @@
                                             </Button>
                                         </Grid>
                                     </Border>
+                                    <Popup x:Name="TokenUsagePopup"
+                                           Grid.Column="2"
+                                           PlacementTarget="{Binding ElementName=TokenUsageCard}"
+                                           Placement="Top"
+                                           HorizontalOffset="-8"
+                                           VerticalOffset="-10"
+                                           AllowsTransparency="True"
+                                           PopupAnimation="Fade"
+                                           StaysOpen="True">
+                                        <Border Background="{DynamicResource LauncherBackground}"
+                                                BorderBrush="{DynamicResource BorderColor}"
+                                                BorderThickness="1"
+                                                CornerRadius="14"
+                                                Padding="12,10"
+                                                MinWidth="186"
+                                                MouseEnter="TokenUsagePopup_MouseEnter"
+                                                MouseLeave="TokenUsagePopup_MouseLeave">
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="18" ShadowDepth="0" Opacity="0.16"/>
+                                            </Border.Effect>
+                                            <StackPanel>
+                                                <TextBlock x:Name="TokenUsagePopupTitle"
+                                                           Text="컨텍스트 창"
+                                                           FontSize="12"
+                                                           FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                                <TextBlock x:Name="TokenUsagePopupUsage"
+                                                           Margin="0,6,0,0"
+                                                           Text="76% 창"
+                                                           FontSize="18"
+                                                           FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource PrimaryText}"/>
+                                                <TextBlock x:Name="TokenUsagePopupDetail"
+                                                           Margin="0,2,0,0"
+                                                           Text="197k/258k 캐시 토큰 사용"
+                                                           FontSize="11.5"
+                                                           Foreground="{DynamicResource SecondaryText}"
+                                                           TextWrapping="Wrap"/>
+                                                <TextBlock x:Name="TokenUsagePopupCompact"
+                                                           Margin="0,8,0,0"
+                                                           Text="AX Agent가 컨텍스트를 자동으로 압축합니다"
+                                                           FontSize="11.5"
+                                                           Foreground="{DynamicResource PrimaryText}"
+                                                           TextWrapping="Wrap"/>
+                                            </StackPanel>
+                                        </Border>
+                                    </Popup>
                                     <Button x:Name="BtnTemplateSelector"
                                             Style="{StaticResource OutlineHoverBtn}"
                                             Grid.Column="3"
diff --git a/src/AxCopilot/Views/ChatWindow.xaml.cs b/src/AxCopilot/Views/ChatWindow.xaml.cs
index a335d38..4388b29 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml.cs
+++ b/src/AxCopilot/Views/ChatWindow.xaml.cs
@@ -87,6 +87,7 @@ public partial class ChatWindow : Window
     private readonly DispatcherTimer _taskSummaryRefreshTimer;
     private readonly DispatcherTimer _conversationPersistTimer;
     private readonly DispatcherTimer _agentUiEventTimer;
+    private readonly DispatcherTimer _tokenUsagePopupCloseTimer;
     private CancellationTokenSource? _gitStatusRefreshCts;
     private int _displayedLength; // 현재 화면에 표시된 글자 수
     private ResourceDictionary? _agentThemeDictionary;
@@ -270,6 +271,13 @@ public partial class ChatWindow : Window
             _agentUiEventTimer.Stop();
             FlushPendingAgentUiEvent();
         };
+        _tokenUsagePopupCloseTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(140) };
+        _tokenUsagePopupCloseTimer.Tick += (_, _) =>
+        {
+            _tokenUsagePopupCloseTimer.Stop();
+            if (TokenUsagePopup != null)
+                TokenUsagePopup.IsOpen = false;
+        };
 
         KeyDown += ChatWindow_KeyDown;
         UpdateConversationFailureFilterUi();
@@ -12113,8 +12121,8 @@ public partial class ChatWindow : Window
                 Padding = new Thickness(14, 14, 14, 12),
                 Margin = new Thickness(6, 6, 6, 8),
                 Cursor = Cursors.Hand,
-                Width = 132,
-                Height = 110,
+                Width = 148,
+                Height = 124,
                 ClipToBounds = true,
             };
 
@@ -12127,17 +12135,17 @@ public partial class ChatWindow : Window
 
             var iconCircle = new Border
             {
-                Width = 42, Height = 42,
-                CornerRadius = new CornerRadius(21),
+                Width = 46, Height = 46,
+                CornerRadius = new CornerRadius(23),
                 Background = new SolidColorBrush(((SolidColorBrush)btnColor).Color) { Opacity = 0.15 },
                 HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 0, 0, 10),
+                Margin = new Thickness(0, 0, 0, 12),
             };
             var iconTb = new TextBlock
             {
                 Text = preset.Symbol,
                 FontFamily = new FontFamily("Segoe MDL2 Assets"),
-                FontSize = 18.5,
+                FontSize = 20,
                 Foreground = btnColor,
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
@@ -12148,13 +12156,13 @@ public partial class ChatWindow : Window
             stack.Children.Add(new TextBlock
             {
                 Text = preset.Label,
-                FontSize = 14,
+                FontSize = 15.5,
                 FontWeight = FontWeights.SemiBold,
                 Foreground = primaryText,
                 HorizontalAlignment = HorizontalAlignment.Center,
                 TextAlignment = TextAlignment.Center,
                 TextWrapping = TextWrapping.Wrap,
-                MaxWidth = 98,
+                MaxWidth = 112,
             });
 
             var hoverLabel = new Border
@@ -12172,10 +12180,10 @@ public partial class ChatWindow : Window
                 Child = new TextBlock
                 {
                     Text = preset.Description,
-                    FontSize = 10.5,
+                    FontSize = 11.5,
                     TextWrapping = TextWrapping.Wrap,
                     TextTrimming = TextTrimming.CharacterEllipsis,
-                    MaxHeight = 30,
+                    MaxHeight = 34,
                     Foreground = secondaryText,
                     TextAlignment = TextAlignment.Center,
                 }
@@ -12244,8 +12252,8 @@ public partial class ChatWindow : Window
                 Padding = new Thickness(14, 14, 14, 12),
                 Margin = new Thickness(6, 6, 6, 8),
                 Cursor = Cursors.Hand,
-                Width = 132,
-                Height = 110,
+                Width = 148,
+                Height = 124,
                 ClipToBounds = true,
             };
 
@@ -12258,17 +12266,17 @@ public partial class ChatWindow : Window
 
             var etcIconCircle = new Border
             {
-                Width = 42, Height = 42,
-                CornerRadius = new CornerRadius(21),
+                Width = 46, Height = 46,
+                CornerRadius = new CornerRadius(23),
                 Background = new SolidColorBrush(((SolidColorBrush)etcColor).Color) { Opacity = 0.15 },
                 HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 0, 0, 10),
+                Margin = new Thickness(0, 0, 0, 12),
             };
             etcIconCircle.Child = new TextBlock
             {
                 Text = "\uE70F", // Edit 아이콘
                 FontFamily = new FontFamily("Segoe MDL2 Assets"),
-                FontSize = 18.5,
+                FontSize = 20,
                 Foreground = etcColor,
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
@@ -12278,7 +12286,7 @@ public partial class ChatWindow : Window
             etcStack.Children.Add(new TextBlock
             {
                 Text = "기타",
-                FontSize = 14,
+                FontSize = 15.5,
                 FontWeight = FontWeights.SemiBold,
                 Foreground = primaryText,
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -12299,10 +12307,10 @@ public partial class ChatWindow : Window
                 Child = new TextBlock
                 {
                     Text = "프리셋 없이 자유롭게 대화합니다",
-                    FontSize = 10.5,
+                    FontSize = 11.5,
                     TextWrapping = TextWrapping.Wrap,
                     TextTrimming = TextTrimming.CharacterEllipsis,
-                    MaxHeight = 30,
+                    MaxHeight = 34,
                     Foreground = secondaryText,
                     TextAlignment = TextAlignment.Center,
                 }
@@ -12334,8 +12342,8 @@ public partial class ChatWindow : Window
                 Padding = new Thickness(14, 14, 14, 12),
                 Margin = new Thickness(6, 6, 6, 8),
                 Cursor = Cursors.Hand,
-                Width = 132,
-                Height = 110,
+                Width = 148,
+                Height = 124,
                 ClipToBounds = true,
             };
 
@@ -12347,17 +12355,17 @@ public partial class ChatWindow : Window
             {
                 Text = "\uE710",
                 FontFamily = new FontFamily("Segoe MDL2 Assets"),
-                FontSize = 24,
+                FontSize = 26,
                 Foreground = secondaryText,
                 HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 10, 0, 8),
+                Margin = new Thickness(0, 12, 0, 10),
             };
             addStack.Children.Add(plusIcon);
 
             addStack.Children.Add(new TextBlock
             {
                 Text = "프리셋 추가",
-                FontSize = 13,
+                FontSize = 14.5,
                 FontWeight = FontWeights.SemiBold,
                 Foreground = secondaryText,
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -12378,10 +12386,10 @@ public partial class ChatWindow : Window
                 Child = new TextBlock
                 {
                     Text = "새 작업 유형 카드를 직접 추가합니다",
-                    FontSize = 10.5,
+                    FontSize = 11.5,
                     TextWrapping = TextWrapping.Wrap,
                     TextTrimming = TextTrimming.CharacterEllipsis,
-                    MaxHeight = 30,
+                    MaxHeight = 34,
                     Foreground = secondaryText,
                     TextAlignment = TextAlignment.Center,
                 }
@@ -18702,10 +18710,59 @@ private static (string icon, string label, string bgHex, string fgHex) GetDecisi
             postCompactionUsage +
             pendingPostCompaction;
 
+        if (TokenUsagePopupTitle != null)
+            TokenUsagePopupTitle.Text = $"컨텍스트 창 {percentText}";
+        if (TokenUsagePopupUsage != null)
+            TokenUsagePopupUsage.Text = $"{Services.TokenEstimator.Format(currentTokens)}/{Services.TokenEstimator.Format(maxContextTokens)}";
+        if (TokenUsagePopupDetail != null)
+        {
+            TokenUsagePopupDetail.Text = currentModelTotalTokens > 0
+                ? $"오늘 {currentService} · {currentModel} 사용량 {FormatTokenCount(currentModelTotalTokens)}"
+                : $"{summary} · 자동 압축 시작 {triggerPercent}%";
+        }
+        if (TokenUsagePopupCompact != null)
+        {
+            var compactText = compactLabel switch
+            {
+                "지금 압축" => "지금 압축이 필요합니다",
+                "압축 권장" => "곧 자동 압축이 시작됩니다",
+                "미리 압축" => "여유가 있을 때 먼저 압축할 수 있습니다",
+                _ => "AX Agent가 컨텍스트를 자동으로 관리합니다",
+            };
+            TokenUsagePopupCompact.Text = compactText;
+        }
+        TokenUsageCard.ToolTip = null;
+
         UpdateCircularUsageArc(TokenUsageArc, usageRatio, 18, 18, 14);
         PositionThresholdMarker(TokenUsageThresholdMarker, triggerRatio, 18, 18, 14, 3);
     }
 
+    private void TokenUsageCard_MouseEnter(object sender, MouseEventArgs e)
+    {
+        _tokenUsagePopupCloseTimer.Stop();
+        if (TokenUsagePopup != null && TokenUsageCard?.Visibility == Visibility.Visible)
+            TokenUsagePopup.IsOpen = true;
+    }
+
+    private void TokenUsageCard_MouseLeave(object sender, MouseEventArgs e)
+    {
+        _tokenUsagePopupCloseTimer.Stop();
+        _tokenUsagePopupCloseTimer.Start();
+    }
+
+    private void TokenUsagePopup_MouseEnter(object sender, MouseEventArgs e)
+    {
+        _tokenUsagePopupCloseTimer.Stop();
+        if (TokenUsagePopup != null)
+            TokenUsagePopup.IsOpen = true;
+    }
+
+    private void TokenUsagePopup_MouseLeave(object sender, MouseEventArgs e)
+    {
+        _tokenUsagePopupCloseTimer.Stop();
+        _tokenUsagePopupCloseTimer.Start();
+    }
+
     private static string BuildUsageModelKey(string? service, string? model)
     {
         var normalizedService = (service ?? "").Trim().ToLowerInvariant();