diff --git a/dashboard/src/components/MessageBubble.vue b/dashboard/src/components/MessageBubble.vue
index 1990f5d..e85fe1a 100644
--- a/dashboard/src/components/MessageBubble.vue
+++ b/dashboard/src/components/MessageBubble.vue
@@ -31,9 +31,9 @@
       <div class="message-footer">
         <span class="message-time">{{ formatTime(message.created_at) }}</span>
         <template v-if="message.role === 'assistant' && message.usage">
-          <span class="token-item" v-if="message.usage.prompt">{{ formatNumber(message.usage.prompt) }} in</span>
-          <span class="token-item" v-if="message.usage.completion">{{ formatNumber(message.usage.completion) }} out</span>
-          <span class="token-item" v-if="message.usage.total">{{ formatNumber(message.usage.total) }} total</span>
+          <span class="token-item" v-if="message.usage.prompt_tokens">{{ formatNumber(message.usage.prompt_tokens) }} in</span>
+          <span class="token-item" v-if="message.usage.completion_tokens">{{ formatNumber(message.usage.completion_tokens) }} out</span>
+          <span class="token-item" v-if="message.usage.total_tokens">{{ formatNumber(message.usage.total_tokens) }} total</span>
         </template>
         <button v-if="message.role === 'assistant'" class="ghost-btn success" @click="$emit('regenerate', message.id)" title="重新生成">
           <span v-html="regenerateIcon"></span>
diff --git a/dashboard/src/main.js b/dashboard/src/main.js
index e4c52c6..26dddf8 100644
--- a/dashboard/src/main.js
+++ b/dashboard/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from 'vue'
 import './style.css'
 import App from './App.vue'
 import router from './router'
-import { pinia } from './utils'
+import pinia from './utils/store.js'
 
 // 初始化夜间模式
 if (localStorage.getItem('theme') === 'dark') {
diff --git a/dashboard/src/utils/index.js b/dashboard/src/utils/index.js
deleted file mode 100644
index 1d35eb9..0000000
--- a/dashboard/src/utils/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as pinia } from './store.js'
diff --git a/dashboard/src/views/HomeView.vue b/dashboard/src/views/HomeView.vue
index 1a28ab3..b8ac5f1 100644
--- a/dashboard/src/views/HomeView.vue
+++ b/dashboard/src/views/HomeView.vue
@@ -40,6 +40,8 @@ onMounted(async () => {
     if (convs.status === 'fulfilled' && convs.value.success) {
       stats.value.conversations = convs.value.data?.total || 0
       const items = convs.value.data?.items || []
+      console.log('[HomeView] conversations response:', convs.value.data)
+      console.log('[HomeView] items with token_count:', items.map(i => ({ id: i.id, token_count: i.token_count })))
       stats.value.totalTokens = items.reduce((sum, c) => sum + (c.token_count || 0), 0)
     }
     if (tools.status === 'fulfilled' && tools.value.success) {
diff --git a/luxx/routes/conversations.py b/luxx/routes/conversations.py
index d4c0b11..4391883 100644
--- a/luxx/routes/conversations.py
+++ b/luxx/routes/conversations.py
@@ -65,14 +65,17 @@ def list_conversations(
         ).all()
         total_tokens = 0
         for msg in assistant_messages:
-            total_tokens += msg.token_count or 0
-            # Also try to get usage from the usage field
+            # Get usage from the usage field (new format from LLM)
             if msg.usage:
                 try:
                     usage_obj = json.loads(msg.usage)
-                    total_tokens = usage_obj.get("total_tokens", total_tokens)
+                    total_tokens += usage_obj.get("total_tokens", 0)
                 except:
-                    pass
+                    # Fallback to token_count field
+                    total_tokens += msg.token_count or 0
+            else:
+                # Legacy messages without usage field
+                total_tokens += msg.token_count or 0
         conv_dict['token_count'] = total_tokens
         items.append(conv_dict)
     
diff --git a/luxx/tools/core.py b/luxx/tools/core.py
index 0b5f24c..c283446 100644
--- a/luxx/tools/core.py
+++ b/luxx/tools/core.py
@@ -105,6 +105,9 @@ class ToolRegistry:
         # Automatic permission check (transparent to tool function)
         if context is not None and context.user_id is not None:
             user_level = context.extra.get("user_permission_level", CommandPermission.READ_ONLY)
+            # Ensure user_level is an enum for comparison and display
+            if isinstance(user_level, int):
+                user_level = CommandPermission(user_level)
             if user_level < tool.required_permission:
                 return {
                     "success": False,