apteva 0.4.41 → 0.4.48

package/src/web/components/telemetry/TelemetryPage.tsx

@@ -13,15 +13,36 @@ interface TelemetryStats {
   total_errors: number;
   total_input_tokens: number;
   total_output_tokens: number;
+  total_cache_creation_tokens: number;
+  total_cache_read_tokens: number;
+  total_reasoning_tokens: number;
+  total_cost: number;
 }
 
 interface UsageByAgent {
   agent_id: string;
   input_tokens: number;
   output_tokens: number;
+  cache_creation_tokens: number;
+  cache_read_tokens: number;
+  reasoning_tokens: number;
   llm_calls: number;
   tool_calls: number;
   errors: number;
+  cost: number;
+}
+
+interface UsageByProject {
+  project_id: string | null;
+  input_tokens: number;
+  output_tokens: number;
+  cache_creation_tokens: number;
+  cache_read_tokens: number;
+  reasoning_tokens: number;
+  llm_calls: number;
+  tool_calls: number;
+  errors: number;
+  cost: number;
 }
 
 interface DailyUsage {
@@ -40,12 +61,18 @@ function extractEventStats(event: TelemetryEvent): {
   errors: number;
   input_tokens: number;
   output_tokens: number;
+  cache_creation_tokens: number;
+  cache_read_tokens: number;
+  reasoning_tokens: number;
 } {
   const isLlm = event.category === "LLM";
   const isTool = event.category === "TOOL";
   const isError = event.level === "error";
   const inputTokens = (event.data?.input_tokens as number) || 0;
   const outputTokens = (event.data?.output_tokens as number) || 0;
+  const cacheCreationTokens = (event.data?.cache_creation_tokens as number) || 0;
+  const cacheReadTokens = (event.data?.cache_read_tokens as number) || 0;
+  const reasoningTokens = (event.data?.reasoning_tokens as number) || 0;
 
   return {
     llm_calls: isLlm ? 1 : 0,
@@ -53,17 +80,21 @@ function extractEventStats(event: TelemetryEvent): {
     errors: isError ? 1 : 0,
     input_tokens: inputTokens,
     output_tokens: outputTokens,
+    cache_creation_tokens: cacheCreationTokens,
+    cache_read_tokens: cacheReadTokens,
+    reasoning_tokens: reasoningTokens,
   };
 }
 
 export function TelemetryPage() {
   const { events: realtimeEvents, statusChangeCounter } = useTelemetryContext();
-  const { currentProjectId, currentProject } = useProjects();
+  const { currentProjectId, currentProject, costTrackingEnabled, projectsEnabled, projects } = useProjects();
   const { authFetch } = useAuth();
   const [fetchedStats, setFetchedStats] = useState<TelemetryStats | null>(null);
   const [historicalEvents, setHistoricalEvents] = useState<TelemetryEvent[]>([]);
   const [fetchedUsage, setFetchedUsage] = useState<UsageByAgent[]>([]);
   const [dailyUsage, setDailyUsage] = useState<DailyUsage[]>([]);
+  const [projectUsage, setProjectUsage] = useState<UsageByProject[]>([]);
   const [loading, setLoading] = useState(true);
   const [filter, setFilter] = useState({
     level: "",
@@ -74,6 +105,37 @@ export function TelemetryPage() {
   const [agents, setAgents] = useState<Array<{ id: string; name: string; projectId: string | null }>>([]);
   const [expandedEvent, setExpandedEvent] = useState<string | null>(null);
 
+  // Time range filter
+  const [timeRange, setTimeRange] = useState<string>("all");
+
+  // Sort state for usage table
+  type SortKey = "agent" | "llm_calls" | "tool_calls" | "input_tokens" | "output_tokens" | "cache_creation_tokens" | "cache_read_tokens" | "reasoning_tokens" | "errors" | "cost";
+  const [sortKey, setSortKey] = useState<SortKey>("cost");
+  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
+
+  const handleSort = (key: SortKey) => {
+    if (sortKey === key) {
+      setSortDir(d => d === "asc" ? "desc" : "asc");
+    } else {
+      setSortKey(key);
+      setSortDir("desc");
+    }
+  };
+
+  // Sort state for project usage table
+  type ProjectSortKey = "project" | "llm_calls" | "tool_calls" | "input_tokens" | "output_tokens" | "cache_creation_tokens" | "cache_read_tokens" | "reasoning_tokens" | "errors" | "cost";
+  const [projectSortKey, setProjectSortKey] = useState<ProjectSortKey>("cost");
+  const [projectSortDir, setProjectSortDir] = useState<"asc" | "desc">("desc");
+
+  const handleProjectSort = (key: ProjectSortKey) => {
+    if (projectSortKey === key) {
+      setProjectSortDir(d => d === "asc" ? "desc" : "asc");
+    } else {
+      setProjectSortKey(key);
+      setProjectSortDir("desc");
+    }
+  };
+
   // Track IDs that were in the fetched stats to avoid double-counting
   const countedEventIdsRef = useRef<Set<string>>(new Set());
 
@@ -105,16 +167,35 @@ export function TelemetryPage() {
   // Get agent IDs for the current project
   const projectAgentIds = useMemo(() => new Set(filteredAgents.map(a => a.id)), [filteredAgents]);
 
+  // Compute `since` ISO string from selected time range
+  const getSince = useCallback((): string | undefined => {
+    if (timeRange === "all") return undefined;
+    const now = new Date();
+    const ms: Record<string, number> = {
+      "1h": 3600000,
+      "6h": 6 * 3600000,
+      "24h": 24 * 3600000,
+      "7d": 7 * 24 * 3600000,
+      "30d": 30 * 24 * 3600000,
+    };
+    if (ms[timeRange]) {
+      return new Date(now.getTime() - ms[timeRange]).toISOString();
+    }
+    return undefined;
+  }, [timeRange]);
+
   // Fetch stats and historical data (less frequently now since we have real-time)
   const fetchData = async () => {
     setLoading(true);
     try {
       // Build project filter param
       const projectParam = currentProjectId === "unassigned" ? "null" : currentProjectId || "";
+      const since = getSince();
 
       // Fetch stats
       const statsParams = new URLSearchParams();
       if (projectParam) statsParams.set("project_id", projectParam);
+      if (since) statsParams.set("since", since);
       const statsRes = await authFetch(`/api/telemetry/stats${statsParams.toString() ? `?${statsParams}` : ""}`);
       const statsData = await statsRes.json();
       setFetchedStats(statsData.stats);
@@ -124,6 +205,7 @@ export function TelemetryPage() {
       if (filter.level) params.set("level", filter.level);
       if (filter.agent_id) params.set("agent_id", filter.agent_id);
       if (projectParam) params.set("project_id", projectParam);
+      if (since) params.set("since", since);
       params.set("limit", "100"); // Fetch more since we filter client-side
 
       const eventsRes = await authFetch(`/api/telemetry/events?${params}`);
@@ -138,6 +220,7 @@ export function TelemetryPage() {
       const usageParams = new URLSearchParams();
       usageParams.set("group_by", "agent");
       if (projectParam) usageParams.set("project_id", projectParam);
+      if (since) usageParams.set("since", since);
       const usageRes = await authFetch(`/api/telemetry/usage?${usageParams}`);
       const usageData = await usageRes.json();
       setFetchedUsage(usageData.usage || []);
@@ -146,6 +229,7 @@ export function TelemetryPage() {
       const dailyParams = new URLSearchParams();
       dailyParams.set("group_by", "day");
       if (projectParam) dailyParams.set("project_id", projectParam);
+      if (since) dailyParams.set("since", since);
       const dailyRes = await authFetch(`/api/telemetry/usage?${dailyParams}`);
       const dailyData = await dailyRes.json();
       // Sort by date ascending for charts
@@ -153,6 +237,18 @@ export function TelemetryPage() {
         a.date.localeCompare(b.date)
       );
       setDailyUsage(sorted);
+
+      // Fetch usage by project (only when viewing all projects and feature is enabled)
+      if (projectsEnabled && currentProjectId === null) {
+        const projParams = new URLSearchParams();
+        projParams.set("group_by", "project");
+        if (since) projParams.set("since", since);
+        const projRes = await authFetch(`/api/telemetry/usage?${projParams}`);
+        const projData = await projRes.json();
+        setProjectUsage(projData.usage || []);
+      } else {
+        setProjectUsage([]);
+      }
     } catch (e) {
       console.error("Failed to fetch telemetry:", e);
     }
@@ -161,7 +257,7 @@ export function TelemetryPage() {
 
   useEffect(() => {
     fetchData();
-  }, [filter, currentProjectId, authFetch, statusChangeCounter]);
+  }, [filter, timeRange, currentProjectId, authFetch, statusChangeCounter]);
 
   // Compute real-time stats from new events (not already counted in fetched stats)
   const stats = useMemo(() => {
@@ -174,6 +270,9 @@ export function TelemetryPage() {
     let deltaErrors = 0;
     let deltaInputTokens = 0;
     let deltaOutputTokens = 0;
+    let deltaCacheCreationTokens = 0;
+    let deltaCacheReadTokens = 0;
+    let deltaReasoningTokens = 0;
 
     for (const event of realtimeEvents) {
       if (!countedEventIdsRef.current.has(event.id)) {
@@ -184,6 +283,9 @@ export function TelemetryPage() {
         deltaErrors += eventStats.errors;
         deltaInputTokens += eventStats.input_tokens;
         deltaOutputTokens += eventStats.output_tokens;
+        deltaCacheCreationTokens += eventStats.cache_creation_tokens;
+        deltaCacheReadTokens += eventStats.cache_read_tokens;
+        deltaReasoningTokens += eventStats.reasoning_tokens;
       }
     }
 
@@ -194,6 +296,10 @@ export function TelemetryPage() {
       total_errors: fetchedStats.total_errors + deltaErrors,
       total_input_tokens: fetchedStats.total_input_tokens + deltaInputTokens,
       total_output_tokens: fetchedStats.total_output_tokens + deltaOutputTokens,
+      total_cache_creation_tokens: (fetchedStats.total_cache_creation_tokens || 0) + deltaCacheCreationTokens,
+      total_cache_read_tokens: (fetchedStats.total_cache_read_tokens || 0) + deltaCacheReadTokens,
+      total_reasoning_tokens: (fetchedStats.total_reasoning_tokens || 0) + deltaReasoningTokens,
+      total_cost: fetchedStats.total_cost || 0,
     };
   }, [fetchedStats, realtimeEvents]);
 
@@ -216,6 +322,9 @@ export function TelemetryPage() {
           existing.errors += eventStats.errors;
           existing.input_tokens += eventStats.input_tokens;
           existing.output_tokens += eventStats.output_tokens;
+          existing.cache_creation_tokens += eventStats.cache_creation_tokens;
+          existing.cache_read_tokens += eventStats.cache_read_tokens;
+          existing.reasoning_tokens += eventStats.reasoning_tokens;
         } else {
           usageMap.set(event.agent_id, {
             agent_id: event.agent_id,
@@ -224,6 +333,10 @@ export function TelemetryPage() {
             errors: eventStats.errors,
             input_tokens: eventStats.input_tokens,
             output_tokens: eventStats.output_tokens,
+            cache_creation_tokens: eventStats.cache_creation_tokens,
+            cache_read_tokens: eventStats.cache_read_tokens,
+            reasoning_tokens: eventStats.reasoning_tokens,
+            cost: 0,
           });
         }
       }
@@ -232,6 +345,49 @@ export function TelemetryPage() {
     return Array.from(usageMap.values());
   }, [fetchedUsage, realtimeEvents]);
 
+  // Sorted usage for the table
+  const sortedUsage = useMemo(() => {
+    const sorted = [...usage];
+    sorted.sort((a, b) => {
+      if (sortKey === "agent") {
+        const aName = (agents.find(ag => ag.id === a.agent_id)?.name || a.agent_id).toLowerCase();
+        const bName = (agents.find(ag => ag.id === b.agent_id)?.name || b.agent_id).toLowerCase();
+        return sortDir === "asc" ? (aName < bName ? -1 : 1) : (aName > bName ? -1 : 1);
+      }
+      const aVal = a[sortKey] as number;
+      const bVal = b[sortKey] as number;
+      return sortDir === "asc" ? aVal - bVal : bVal - aVal;
+    });
+    return sorted;
+  }, [usage, sortKey, sortDir, agents]);
+
+  // Sorted project usage for the table
+  const sortedProjectUsage = useMemo(() => {
+    const sorted = [...projectUsage];
+    sorted.sort((a, b) => {
+      if (projectSortKey === "project") {
+        const aName = (a.project_id ? projects.find(p => p.id === a.project_id)?.name || a.project_id : "Unassigned").toLowerCase();
+        const bName = (b.project_id ? projects.find(p => p.id === b.project_id)?.name || b.project_id : "Unassigned").toLowerCase();
+        return projectSortDir === "asc" ? (aName < bName ? -1 : 1) : (aName > bName ? -1 : 1);
+      }
+      const aVal = a[projectSortKey] as number;
+      const bVal = b[projectSortKey] as number;
+      return projectSortDir === "asc" ? aVal - bVal : bVal - aVal;
+    });
+    return sorted;
+  }, [projectUsage, projectSortKey, projectSortDir, projects]);
+
+  const getProjectName = (projectId: string | null) => {
+    if (!projectId) return "Unassigned";
+    const project = projects.find(p => p.id === projectId);
+    return project?.name || projectId;
+  };
+
+  const getProjectColor = (projectId: string | null) => {
+    if (!projectId) return undefined;
+    return projects.find(p => p.id === projectId)?.color;
+  };
+
   // Merge real-time events with historical, filtering and deduping
   const allEvents = React.useMemo(() => {
     // Apply filters to real-time events
@@ -315,7 +471,7 @@ export function TelemetryPage() {
   };
 
   const levelColors: Record<string, string> = {
-    debug: "text-[#555]",
+    debug: "text-[var(--color-text-faint)]",
     info: "text-blue-400",
     warn: "text-yellow-400",
     error: "text-red-400",
@@ -380,20 +536,56 @@ export function TelemetryPage() {
                 : `Telemetry - ${currentProject?.name || ""}`}
             </h1>
           </div>
-          <p className="text-[#666]">
+          <p className="text-[var(--color-text-muted)]">
             Monitor agent activity, token usage, and errors.
           </p>
         </div>
 
+        {/* Time Range Selector */}
+        <div className="flex gap-2 mb-6">
+          {[
+            { value: "1h", label: "Last hour" },
+            { value: "6h", label: "Last 6h" },
+            { value: "24h", label: "Last 24h" },
+            { value: "7d", label: "Last 7 days" },
+            { value: "30d", label: "Last 30 days" },
+            { value: "all", label: "All time" },
+          ].map(opt => (
+            <button
+              key={opt.value}
+              onClick={() => setTimeRange(opt.value)}
+              className={`px-3 py-1.5 rounded text-sm transition ${
+                timeRange === opt.value
+                  ? "bg-[var(--color-accent)] text-black"
+                  : "bg-[var(--color-surface-raised)] hover:bg-[var(--color-surface-raised)] text-[var(--color-text-secondary)]"
+              }`}
+            >
+              {opt.label}
+            </button>
+          ))}
+        </div>
+
         {/* Stats Cards */}
         {stats && (
-          <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-4 mb-6">
+          <div className="flex flex-wrap gap-4 mb-6">
             <StatCard label="Events" value={formatNumber(stats.total_events)} />
             <StatCard label="LLM Calls" value={formatNumber(stats.total_llm_calls)} />
             <StatCard label="Tool Calls" value={formatNumber(stats.total_tool_calls)} />
             <StatCard label="Errors" value={formatNumber(stats.total_errors)} color="red" />
             <StatCard label="Input Tokens" value={formatNumber(stats.total_input_tokens)} />
             <StatCard label="Output Tokens" value={formatNumber(stats.total_output_tokens)} />
+            {(stats.total_cache_creation_tokens > 0 || stats.total_cache_read_tokens > 0) && (
+              <>
+                <StatCard label="Cache Write" value={formatNumber(stats.total_cache_creation_tokens)} />
+                <StatCard label="Cache Read" value={formatNumber(stats.total_cache_read_tokens)} />
+              </>
+            )}
+            {stats.total_reasoning_tokens > 0 && (
+              <StatCard label="Reasoning" value={formatNumber(stats.total_reasoning_tokens)} />
+            )}
+            {costTrackingEnabled && (
+              <StatCard label="Total Cost" value={`$${stats.total_cost.toFixed(4)}`} color="orange" />
+            )}
           </div>
         )}
 
@@ -427,15 +619,15 @@ export function TelemetryPage() {
           return (
           <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-6">
             {/* Activity Chart */}
-            <div className="bg-[#111] border border-[#1a1a1a] rounded-lg p-4">
-              <h3 className="text-sm font-medium text-[#888] mb-4">{chartLabel} Activity</h3>
+            <div className="bg-[var(--color-surface)] card p-4">
+              <h3 className="text-sm font-medium text-[var(--color-text-secondary)] mb-4">{chartLabel} Activity</h3>
               <ResponsiveContainer width="100%" height={200}>
                 <AreaChart data={chartData}>
-                  <CartesianGrid strokeDasharray="3 3" stroke="#1a1a1a" />
+                  <CartesianGrid strokeDasharray="3 3" stroke="var(--color-border)" />
                   <XAxis
                     dataKey="date"
-                    stroke="#444"
-                    tick={{ fill: "#666", fontSize: 11 }}
+                    stroke="var(--color-border-light)"
+                    tick={{ fill: "var(--color-text-muted)", fontSize: 11 }}
                     tickFormatter={(v) => {
                       if (!useDaily && v.includes(" ")) {
                         return v.split(" ")[1];
@@ -444,15 +636,15 @@ export function TelemetryPage() {
                       return `${d.getMonth() + 1}/${d.getDate()}`;
                     }}
                   />
-                  <YAxis stroke="#444" tick={{ fill: "#666", fontSize: 11 }} allowDecimals={false} />
+                  <YAxis stroke="var(--color-border-light)" tick={{ fill: "var(--color-text-muted)", fontSize: 11 }} allowDecimals={false} />
                   <Tooltip
                     contentStyle={{
-                      backgroundColor: "#111",
-                      border: "1px solid #333",
+                      backgroundColor: "var(--color-surface)",
+                      border: "1px solid var(--color-border-light)",
                       borderRadius: "8px",
                       fontSize: 12,
                     }}
-                    labelStyle={{ color: "#888" }}
+                    labelStyle={{ color: "var(--color-text-secondary)" }}
                     cursor={{ stroke: "rgba(255,255,255,0.1)" }}
                     labelFormatter={(v) => useDaily ? new Date(v + "T00:00:00").toLocaleDateString() : v}
                   />
@@ -465,19 +657,21 @@ export function TelemetryPage() {
                     type="monotone"
                     dataKey="llm_calls"
                     name="LLM Calls"
-                    stroke="#f97316"
-                    fill="#f97316"
+                    stroke="var(--color-accent)"
+                    fill="var(--color-accent)"
                     fillOpacity={0.15}
                     strokeWidth={1.5}
+
                   />
                   <Area
                     type="monotone"
                     dataKey="tool_calls"
                     name="Tool Calls"
-                    stroke="#fb923c"
-                    fill="#fb923c"
+                    stroke="var(--color-accent-hover)"
+                    fill="var(--color-accent-hover)"
                     fillOpacity={0.08}
                     strokeWidth={1.5}
+
                   />
                   <Area
                     type="monotone"
@@ -487,21 +681,22 @@ export function TelemetryPage() {
                     fill="#ef4444"
                     fillOpacity={0.1}
                     strokeWidth={1.5}
+
                   />
                 </AreaChart>
               </ResponsiveContainer>
             </div>
 
             {/* Token Usage Chart */}
-            <div className="bg-[#111] border border-[#1a1a1a] rounded-lg p-4">
-              <h3 className="text-sm font-medium text-[#888] mb-4">{chartLabel} Token Usage</h3>
+            <div className="bg-[var(--color-surface)] card p-4">
+              <h3 className="text-sm font-medium text-[var(--color-text-secondary)] mb-4">{chartLabel} Token Usage</h3>
               <ResponsiveContainer width="100%" height={200}>
                 <BarChart data={chartData}>
-                  <CartesianGrid strokeDasharray="3 3" stroke="#1a1a1a" />
+                  <CartesianGrid strokeDasharray="3 3" stroke="var(--color-border)" />
                   <XAxis
                     dataKey="date"
-                    stroke="#444"
-                    tick={{ fill: "#666", fontSize: 11 }}
+                    stroke="var(--color-border-light)"
+                    tick={{ fill: "var(--color-text-muted)", fontSize: 11 }}
                     tickFormatter={(v) => {
                       if (!useDaily && v.includes(" ")) {
                         return v.split(" ")[1];
@@ -511,8 +706,8 @@ export function TelemetryPage() {
                     }}
                   />
                   <YAxis
-                    stroke="#444"
-                    tick={{ fill: "#666", fontSize: 11 }}
+                    stroke="var(--color-border-light)"
+                    tick={{ fill: "var(--color-text-muted)", fontSize: 11 }}
                     tickFormatter={(v) => {
                       if (v >= 1000000) return `${(v / 1000000).toFixed(1)}M`;
                       if (v >= 1000) return `${(v / 1000).toFixed(0)}K`;
@@ -521,12 +716,12 @@ export function TelemetryPage() {
                   />
                   <Tooltip
                     contentStyle={{
-                      backgroundColor: "#111",
-                      border: "1px solid #333",
+                      backgroundColor: "var(--color-surface)",
+                      border: "1px solid var(--color-border-light)",
                       borderRadius: "8px",
                       fontSize: 12,
                     }}
-                    labelStyle={{ color: "#888" }}
+                    labelStyle={{ color: "var(--color-text-secondary)" }}
                     cursor={{ fill: "rgba(255,255,255,0.03)" }}
                     labelFormatter={(v) => useDaily ? new Date(v + "T00:00:00").toLocaleDateString() : v}
                     formatter={(value: number) => [value.toLocaleString(), undefined]}
@@ -539,14 +734,16 @@ export function TelemetryPage() {
                   <Bar
                     dataKey="input_tokens"
                     name="Input Tokens"
-                    fill="#f97316"
+                    fill="var(--color-accent)"
                     radius={[2, 2, 0, 0]}
+
                   />
                   <Bar
                     dataKey="output_tokens"
                     name="Output Tokens"
-                    fill="#ea580c"
+                    fill="var(--color-accent-hover)"
                     radius={[2, 2, 0, 0]}
+
                   />
                 </BarChart>
               </ResponsiveContainer>
@@ -556,43 +753,186 @@ export function TelemetryPage() {
         })()}
 
         {/* Usage by Agent */}
-        {usage.length > 0 && (
+        {usage.length > 0 && (() => {
+          const maxCost = Math.max(...sortedUsage.map(u => u.cost), 0.0001);
+          const hasCacheTokens = sortedUsage.some(u => (u.cache_creation_tokens || 0) > 0 || (u.cache_read_tokens || 0) > 0);
+          const hasReasoningTokens = sortedUsage.some(u => (u.reasoning_tokens || 0) > 0);
+          const SortHeader = ({ label, field, align = "right" }: { label: string; field: SortKey; align?: string }) => (
+            <th
+              className={`${align === "left" ? "text-left" : "text-right"} p-3 cursor-pointer hover:text-[var(--color-text-secondary)] select-none transition-colors`}
+              onClick={() => handleSort(field)}
+            >
+              <span className="inline-flex items-center gap-1">
+                {align === "right" && sortKey === field && (
+                  <span className="text-orange-400">{sortDir === "asc" ? "\u25b2" : "\u25bc"}</span>
+                )}
+                {label}
+                {align === "left" && sortKey === field && (
+                  <span className="text-orange-400">{sortDir === "asc" ? "\u25b2" : "\u25bc"}</span>
+                )}
+              </span>
+            </th>
+          );
+
+          return (
           <div className="mb-6">
             <h2 className="text-lg font-medium mb-3">Usage by Agent</h2>
-            <div className="bg-[#111] border border-[#1a1a1a] rounded-lg overflow-hidden">
+            <div className="bg-[var(--color-surface)] card overflow-hidden">
               <table className="w-full text-sm">
                 <thead>
-                  <tr className="border-b border-[#1a1a1a] text-[#666]">
-                    <th className="text-left p-3">Agent</th>
-                    <th className="text-right p-3">LLM Calls</th>
-                    <th className="text-right p-3">Tool Calls</th>
-                    <th className="text-right p-3">Input Tokens</th>
-                    <th className="text-right p-3">Output Tokens</th>
-                    <th className="text-right p-3">Errors</th>
+                  <tr className="border-b border-[var(--color-border)] text-[var(--color-text-muted)]">
+                    <SortHeader label="Agent" field="agent" align="left" />
+                    <SortHeader label="LLM Calls" field="llm_calls" />
+                    <SortHeader label="Tool Calls" field="tool_calls" />
+                    <SortHeader label="Input Tokens" field="input_tokens" />
+                    <SortHeader label="Output Tokens" field="output_tokens" />
+                    {hasCacheTokens && <SortHeader label="Cache Write" field="cache_creation_tokens" />}
+                    {hasCacheTokens && <SortHeader label="Cache Read" field="cache_read_tokens" />}
+                    {hasReasoningTokens && <SortHeader label="Reasoning" field="reasoning_tokens" />}
+                    <SortHeader label="Errors" field="errors" />
+                    {costTrackingEnabled && <SortHeader label="Est. Cost" field="cost" />}
                   </tr>
                 </thead>
                 <tbody>
-                  {usage.map((u) => (
-                    <tr key={u.agent_id} className="border-b border-[#1a1a1a] last:border-0">
+                  {sortedUsage.map((u) => (
+                    <tr key={u.agent_id} className="border-b border-[var(--color-border)] last:border-0 hover:bg-[var(--color-bg)]">
                       <td className="p-3 font-medium">{getAgentName(u.agent_id)}</td>
-                      <td className="p-3 text-right text-[#888]">{formatNumber(u.llm_calls)}</td>
-                      <td className="p-3 text-right text-[#888]">{formatNumber(u.tool_calls)}</td>
-                      <td className="p-3 text-right text-[#888]">{formatNumber(u.input_tokens)}</td>
-                      <td className="p-3 text-right text-[#888]">{formatNumber(u.output_tokens)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.llm_calls)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.tool_calls)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.input_tokens)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.output_tokens)}</td>
+                      {hasCacheTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.cache_creation_tokens || 0)}</td>
+                      )}
+                      {hasCacheTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.cache_read_tokens || 0)}</td>
+                      )}
+                      {hasReasoningTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.reasoning_tokens || 0)}</td>
+                      )}
                       <td className="p-3 text-right">
                         {u.errors > 0 ? (
                           <span className="text-red-400">{u.errors}</span>
                         ) : (
-                          <span className="text-[#444]">0</span>
+                          <span className="text-[var(--color-text-faint)]">0</span>
                         )}
                       </td>
+                      {costTrackingEnabled && (
+                        <td className="p-3 text-right">
+                          <div className="flex items-center justify-end gap-2">
+                            <div className="w-16 h-1.5 bg-[var(--color-surface-raised)] rounded-full overflow-hidden">
+                              <div
+                                className="h-full bg-orange-500 rounded-full"
+                                style={{ width: `${(u.cost / maxCost) * 100}%` }}
+                              />
+                            </div>
+                            <span className="text-[var(--color-text-secondary)] min-w-[60px] text-right">${u.cost.toFixed(4)}</span>
+                          </div>
+                        </td>
+                      )}
                     </tr>
                   ))}
                 </tbody>
               </table>
             </div>
           </div>
-        )}
+          );
+        })()}
+
+        {/* Usage by Project */}
+        {projectsEnabled && currentProjectId === null && sortedProjectUsage.length > 0 && (() => {
+          const maxCost = Math.max(...sortedProjectUsage.map(u => u.cost), 0.0001);
+          const hasProjCacheTokens = sortedProjectUsage.some(u => (u.cache_creation_tokens || 0) > 0 || (u.cache_read_tokens || 0) > 0);
+          const hasProjReasoningTokens = sortedProjectUsage.some(u => (u.reasoning_tokens || 0) > 0);
+          const PSortHeader = ({ label, field, align = "right" }: { label: string; field: ProjectSortKey; align?: string }) => (
+            <th
+              className={`${align === "left" ? "text-left" : "text-right"} p-3 cursor-pointer hover:text-[var(--color-text-secondary)] select-none transition-colors`}
+              onClick={() => handleProjectSort(field)}
+            >
+              <span className="inline-flex items-center gap-1">
+                {align === "right" && projectSortKey === field && (
+                  <span className="text-orange-400">{projectSortDir === "asc" ? "\u25b2" : "\u25bc"}</span>
+                )}
+                {label}
+                {align === "left" && projectSortKey === field && (
+                  <span className="text-orange-400">{projectSortDir === "asc" ? "\u25b2" : "\u25bc"}</span>
+                )}
+              </span>
+            </th>
+          );
+
+          return (
+          <div className="mb-6">
+            <h2 className="text-lg font-medium mb-3">Usage by Project</h2>
+            <div className="bg-[var(--color-surface)] card overflow-hidden">
+              <table className="w-full text-sm">
+                <thead>
+                  <tr className="border-b border-[var(--color-border)] text-[var(--color-text-muted)]">
+                    <PSortHeader label="Project" field="project" align="left" />
+                    <PSortHeader label="LLM Calls" field="llm_calls" />
+                    <PSortHeader label="Tool Calls" field="tool_calls" />
+                    <PSortHeader label="Input Tokens" field="input_tokens" />
+                    <PSortHeader label="Output Tokens" field="output_tokens" />
+                    {hasProjCacheTokens && <PSortHeader label="Cache Write" field="cache_creation_tokens" />}
+                    {hasProjCacheTokens && <PSortHeader label="Cache Read" field="cache_read_tokens" />}
+                    {hasProjReasoningTokens && <PSortHeader label="Reasoning" field="reasoning_tokens" />}
+                    <PSortHeader label="Errors" field="errors" />
+                    {costTrackingEnabled && <PSortHeader label="Est. Cost" field="cost" />}
+                  </tr>
+                </thead>
+                <tbody>
+                  {sortedProjectUsage.map((u) => {
+                    const color = getProjectColor(u.project_id);
+                    return (
+                    <tr key={u.project_id || "_unassigned"} className="border-b border-[var(--color-border)] last:border-0 hover:bg-[var(--color-bg)]">
+                      <td className="p-3 font-medium">
+                        <span className="inline-flex items-center gap-2">
+                          {color && <span className="w-2.5 h-2.5 rounded-full flex-shrink-0" style={{ backgroundColor: color }} />}
+                          {getProjectName(u.project_id)}
+                        </span>
+                      </td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.llm_calls)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.tool_calls)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.input_tokens)}</td>
+                      <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.output_tokens)}</td>
+                      {hasProjCacheTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.cache_creation_tokens || 0)}</td>
+                      )}
+                      {hasProjCacheTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.cache_read_tokens || 0)}</td>
+                      )}
+                      {hasProjReasoningTokens && (
+                        <td className="p-3 text-right text-[var(--color-text-secondary)]">{formatNumber(u.reasoning_tokens || 0)}</td>
+                      )}
+                      <td className="p-3 text-right">
+                        {u.errors > 0 ? (
+                          <span className="text-red-400">{u.errors}</span>
+                        ) : (
+                          <span className="text-[var(--color-text-faint)]">0</span>
+                        )}
+                      </td>
+                      {costTrackingEnabled && (
+                        <td className="p-3 text-right">
+                          <div className="flex items-center justify-end gap-2">
+                            <div className="w-16 h-1.5 bg-[var(--color-surface-raised)] rounded-full overflow-hidden">
+                              <div
+                                className="h-full bg-orange-500 rounded-full"
+                                style={{ width: `${(u.cost / maxCost) * 100}%` }}
+                              />
+                            </div>
+                            <span className="text-[var(--color-text-secondary)] min-w-[60px] text-right">${u.cost.toFixed(4)}</span>
+                          </div>
+                        </td>
+                      )}
+                    </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+            </div>
+          </div>
+          );
+        })()}
 
         {/* Filters */}
         <div className="flex flex-wrap items-center gap-3 mb-4">
@@ -608,14 +948,14 @@ export function TelemetryPage() {
           <div className="flex flex-wrap items-center gap-1.5 flex-1">
             {allCategories.map((cat) => {
               const isHidden = hiddenCategories.has(cat);
-              const colorClass = categoryColors[cat] || "bg-[#222] text-[#888] border-[#333]";
+              const colorClass = categoryColors[cat] || "bg-[var(--color-surface-raised)] text-[var(--color-text-secondary)] border-[var(--color-border-light)]";
               return (
                 <button
                   key={cat}
                   onClick={() => toggleCategory(cat)}
                   className={`px-2 py-0.5 rounded text-xs border transition-all ${
                     isHidden
-                      ? "bg-[#1a1a1a] text-[#555] border-[#333] opacity-50"
+                      ? "bg-[var(--color-surface-raised)] text-[var(--color-text-faint)] border-[var(--color-border-light)] opacity-50"
                       : colorClass
                   }`}
                 >
@@ -635,7 +975,7 @@ export function TelemetryPage() {
             </div>
             <button
               onClick={fetchData}
-              className="px-3 py-2 bg-[#1a1a1a] hover:bg-[#222] border border-[#333] rounded text-sm transition"
+              className="px-3 py-2 bg-[var(--color-surface-raised)] hover:bg-[var(--color-surface-raised)] border border-[var(--color-border-light)] rounded text-sm transition"
             >
               Refresh
             </button>
@@ -643,31 +983,31 @@ export function TelemetryPage() {
         </div>
 
         {/* Events List */}
-        <div className="bg-[#111] border border-[#1a1a1a] rounded-lg">
-          <div className="p-3 border-b border-[#1a1a1a] flex items-center justify-between">
+        <div className="bg-[var(--color-surface)] card">
+          <div className="p-3 border-b border-[var(--color-border)] flex items-center justify-between">
             <h2 className="font-medium">Recent Events</h2>
             {realtimeEvents.length > 0 && (
-              <span className="text-xs text-[#666]">
+              <span className="text-xs text-[var(--color-text-muted)]">
                 {realtimeEvents.length} new
               </span>
             )}
           </div>
 
           {loading && allEvents.length === 0 ? (
-            <div className="p-8 text-center text-[#666]">Loading...</div>
+            <div className="p-8 text-center text-[var(--color-text-muted)]">Loading...</div>
           ) : allEvents.length === 0 ? (
-            <div className="p-8 text-center text-[#666]">
+            <div className="p-8 text-center text-[var(--color-text-muted)]">
               No telemetry events yet. Events will appear here in real-time once agents start sending data.
             </div>
           ) : (
-            <div className="divide-y divide-[#1a1a1a]">
+            <div className="divide-y divide-[var(--color-border)]">
               {allEvents.map((event) => {
                 const isNew = newEventIds.has(event.id);
 
                 return (
                   <div
                     key={event.id}
-                    className={`p-3 hover:bg-[#0a0a0a] cursor-pointer transition-all duration-500 ${
+                    className={`p-3 hover:bg-[var(--color-bg)] cursor-pointer transition-all duration-500 ${
                       isNew ? "bg-green-500/5" : ""
                     }`}
                     style={{
@@ -676,17 +1016,17 @@ export function TelemetryPage() {
                     onClick={() => setExpandedEvent(expandedEvent === event.id ? null : event.id)}
                   >
                     <div className="flex items-start gap-3">
-                      <span className={`px-2 py-0.5 rounded text-xs border transition-colors duration-300 ${categoryColors[event.category] || "bg-[#222] text-[#888] border-[#333]"}`}>
+                      <span className={`px-2 py-0.5 rounded text-xs border transition-colors duration-300 ${categoryColors[event.category] || "bg-[var(--color-surface-raised)] text-[var(--color-text-secondary)] border-[var(--color-border-light)]"}`}>
                         {event.category}
                       </span>
                       <div className="flex-1 min-w-0">
                         <div className="flex items-center gap-2">
                           <span className="font-medium text-sm">{event.type}</span>
-                          <span className={`text-xs ${levelColors[event.level] || "text-[#666]"}`}>
+                          <span className={`text-xs ${levelColors[event.level] || "text-[var(--color-text-muted)]"}`}>
                             {event.level}
                           </span>
                           {event.duration_ms && (
-                            <span className="text-xs text-[#555]">{event.duration_ms}ms</span>
+                            <span className="text-xs text-[var(--color-text-faint)]">{event.duration_ms}ms</span>
                           )}
                           <span
                             className={`w-1.5 h-1.5 rounded-full bg-green-400 transition-opacity duration-1000 ${
@@ -694,14 +1034,14 @@ export function TelemetryPage() {
                             }`}
                           />
                         </div>
-                        <div className="text-xs text-[#555] mt-1">
+                        <div className="text-xs text-[var(--color-text-faint)] mt-1">
                           {getAgentName(event.agent_id)} · {new Date(event.timestamp).toLocaleString()}
                         </div>
                         {event.error && (
                           <div className="text-xs text-red-400 mt-1 font-mono">{event.error}</div>
                         )}
                         {expandedEvent === event.id && event.data && Object.keys(event.data).length > 0 && (
-                          <pre className="text-xs text-[#666] mt-2 p-2 bg-[#0a0a0a] rounded overflow-x-auto">
+                          <pre className="text-xs text-[var(--color-text-muted)] mt-2 p-2 bg-[var(--color-bg)] rounded overflow-x-auto">
                             {JSON.stringify(event.data, null, 2)}
                           </pre>
                         )}
@@ -720,9 +1060,9 @@ export function TelemetryPage() {
 
 function StatCard({ label, value, color }: { label: string; value: string; color?: string }) {
   return (
-    <div className="bg-[#111] border border-[#1a1a1a] rounded-lg p-4">
-      <div className="text-[#666] text-xs mb-1">{label}</div>
-      <div className={`text-2xl font-semibold ${color === "red" ? "text-red-400" : ""}`}>
+    <div className="bg-[var(--color-surface)] card p-4 flex-1 min-w-[120px]">
+      <div className="text-[var(--color-text-muted)] text-xs mb-1">{label}</div>
+      <div className={`text-2xl font-semibold ${color === "red" ? "text-red-400" : color === "orange" ? "text-orange-400" : ""}`}>
         {value}
       </div>
     </div>