perf: Phase 1 critical performance fixes + production macOS build

Performance: - Move JSON parsing to background isolate via Isolate.run() (eliminates 2-4s UI freeze) - Cache filteredEntries with key-based invalidation (eliminates O(n) recomputation) - Debounce search queries at 300ms (prevents cascade rebuilds on keystroke) - Flatten timeline from 2-level turn×response Column to single virtualized ListView.builder - Add RepaintBoundary per timeline item (isolates repaints during scroll) - Use context.select for granular rebuilds instead of top-level context.watch - Lazy ExpandableCard: child not built until first expand (replaces AnimatedCrossFade) - Use IndexedStack in AppShell (preserves screen state across tab switches) Fixes: - Collect parse errors instead of silently swallowing them - Show parse error count in timeline filter bar - Fix overflow in tokens screen pie chart legend Build: - Configure Developer ID signing with hardened runtime for production distribution - Enable secure timestamps for notarization - Update app name to Claude Session Viewer - Signed, notarized, stapled DMG distribution
Rename to Claude Session Analysis and prepare for Mac App Store
2026-04-07 13:32:13 -04:00 · 2026-03-12 16:57:20 -04:00
19 changed files with 1007 additions and 541 deletions
--- a/lib/main.dart
+++ b/lib/main.dart
@ -5,18 +5,18 @@ import 'theme/app_theme.dart';
 import 'widgets/navigation/app_shell.dart';

 void main() {
-  runApp(const ClaudeSessionViewerApp());
+  runApp(const ClaudeSessionAnalysisApp());
 }

-class ClaudeSessionViewerApp extends StatelessWidget {
-  const ClaudeSessionViewerApp({super.key});
+class ClaudeSessionAnalysisApp extends StatelessWidget {
+  const ClaudeSessionAnalysisApp({super.key});

  @override
  Widget build(BuildContext context) {
    return ChangeNotifierProvider(
      create: (_) => SessionProvider(),
      child: MaterialApp(
-        title: 'Claude Session Viewer',
+        title: 'Claude Session Analysis',
        debugShowCheckedModeBanner: false,
        theme: AppTheme.dark,
        home: const Scaffold(
--- a/lib/providers/session_provider.dart
+++ b/lib/providers/session_provider.dart
@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 import '../models/agent_info.dart';
 import '../models/log_entry.dart';
@ -10,12 +12,21 @@ class SessionProvider with ChangeNotifier {
  bool _isLoading = false;
  String? _error;
  String? _filePath;
+  List<ParseError> _parseErrors = const [];

  // Filter state
  String? _selectedAgentId;
  Set<String> _visibleTypes = {'user', 'assistant', 'system'};
  String _searchQuery = '';

+  // Cached filtered results
+  List<LogEntry> _cachedFilteredEntries = const [];
+  // Cache key — tracks what was used to compute the cache
+  _FilterKey? _cachedFilterKey;
+
+  // Debounce timer for search
+  Timer? _searchDebounce;
+
  SessionLog? get session => _session;
  bool get isLoading => _isLoading;
  String? get error => _error;
@ -23,15 +34,30 @@ class SessionProvider with ChangeNotifier {
  String? get selectedAgentId => _selectedAgentId;
  Set<String> get visibleTypes => _visibleTypes;
  String get searchQuery => _searchQuery;
+  List<ParseError> get parseErrors => _parseErrors;

  AgentInfo? get selectedAgent {
    if (_session == null || _selectedAgentId == null) return null;
-    return _session!.agents
-        .where((a) => a.id == _selectedAgentId)
-        .firstOrNull;
+    return _session!.agents.where((a) => a.id == _selectedAgentId).firstOrNull;
  }

  List<LogEntry> get filteredEntries {
+    final key = _FilterKey(
+      selectedAgentId: _selectedAgentId,
+      visibleTypes: _visibleTypes,
+      searchQuery: _searchQuery,
+      hasSession: _session != null,
+    );
+
+    if (_cachedFilterKey == key) return _cachedFilteredEntries;
+
+    // Recompute
+    _cachedFilterKey = key;
+    _cachedFilteredEntries = _computeFilteredEntries();
+    return _cachedFilteredEntries;
+  }
+
+  List<LogEntry> _computeFilteredEntries() {
    if (_session == null) return [];

    List<LogEntry> entries;
@ -73,10 +99,14 @@ class SessionProvider with ChangeNotifier {
    _filePath = filePath;
    _selectedAgentId = null;
    _searchQuery = '';
+    _parseErrors = const [];
+    _invalidateCache();
    notifyListeners();

    try {
-      _session = await _parser.parseFile(filePath);
+      final result = await _parser.parseFile(filePath);
+      _session = result.sessionLog;
+      _parseErrors = result.errors;
      _error = null;
    } catch (e) {
      _error = e.toString();
@ -89,6 +119,7 @@ class SessionProvider with ChangeNotifier {

  void selectAgent(String? agentId) {
    _selectedAgentId = agentId;
+    _invalidateCache();
    notifyListeners();
  }

@ -98,12 +129,18 @@ class SessionProvider with ChangeNotifier {
    } else {
      _visibleTypes = Set.from(_visibleTypes)..add(type);
    }
+    _invalidateCache();
    notifyListeners();
  }

  void setSearchQuery(String query) {
    _searchQuery = query;
+    // Update cache immediately but debounce notifyListeners
+    _invalidateCache();
+    _searchDebounce?.cancel();
+    _searchDebounce = Timer(const Duration(milliseconds: 300), () {
      notifyListeners();
+    });
  }

  void clearSession() {
@ -112,6 +149,55 @@ class SessionProvider with ChangeNotifier {
    _error = null;
    _selectedAgentId = null;
    _searchQuery = '';
+    _parseErrors = const [];
+    _searchDebounce?.cancel();
+    _invalidateCache();
    notifyListeners();
  }
+
+  void _invalidateCache() {
+    _cachedFilterKey = null;
+  }
+
+  @override
+  void dispose() {
+    _searchDebounce?.cancel();
+    super.dispose();
+  }
+}
+
+/// Immutable key to detect whether the filter result has changed.
+class _FilterKey {
+  final String? selectedAgentId;
+  final Set<String> visibleTypes;
+  final String searchQuery;
+  final bool hasSession;
+
+  const _FilterKey({
+    required this.selectedAgentId,
+    required this.visibleTypes,
+    required this.searchQuery,
+    required this.hasSession,
+  });
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is _FilterKey &&
+          selectedAgentId == other.selectedAgentId &&
+          _setEquals(visibleTypes, other.visibleTypes) &&
+          searchQuery == other.searchQuery &&
+          hasSession == other.hasSession;
+
+  @override
+  int get hashCode =>
+      Object.hash(selectedAgentId, Object.hashAll(visibleTypes), searchQuery, hasSession);
+
+  static bool _setEquals<T>(Set<T> a, Set<T> b) {
+    if (a.length != b.length) return false;
+    for (final v in a) {
+      if (!b.contains(v)) return false;
+    }
+    return true;
+  }
 }
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@ -107,58 +107,58 @@ class _HomeScreenState extends State<HomeScreen> {
    _scanProjects();
  }

+  /// Returns the real user home directory, even inside App Sandbox.
+  /// In sandbox, HOME points to ~/Library/Containers/<bundleid>/Data.
+  String? _getRealHome() {
+    final home = Platform.environment['HOME'];
+    if (home == null) return null;
+    final match = RegExp(r'^(/Users/[^/]+)/Library/Containers/').firstMatch(home);
+    if (match != null) return match.group(1);
+    return home;
+  }
+
  /// Converts the encoded dir name to a human-readable project name.
  /// "-Users-mathias-Documents-workspaces-svrnty-talos-rpi5" → "svrnty / talos-rpi5"
  /// "-Users-mathias" → "~ (home)"
-  /// "-Applications-Auto-Claude-app-Contents-Resources-backend" → "Auto-Claude / backend"
  String _parsePrettyName(String dirName) {
-    // Reconstruct the original path: leading - is /, inner - are /
-    // But careful: "a-gent-maf-debug" is a single folder name with dashes.
-    // The trick: the encoded path uses - as separator for EVERY path component.
-    // We know the common prefixes so we can strip them.
-    String path = dirName;
+    final home = _getRealHome() ?? '';
+    final username = home.split('/').last;

-    // Strip known prefixes to get to the interesting part
+    // Try to reconstruct the actual filesystem path
+    final reconstructed = _reconstructPath(dirName, home);
+    if (reconstructed != null) {
+      final segs = reconstructed.split('/').where((s) => s.isNotEmpty).toList();
+      // Remove common uninteresting segments
+      final skip = {'Users', username, 'Documents', 'workspaces', 'Workspaces',
+                     'Applications', 'Contents', 'Resources', 'Volumes'};
+      final meaningful = segs.where((s) => !skip.contains(s)).toList();
+      if (meaningful.isEmpty) return '~ (home)';
+      if (meaningful.length >= 2) {
+        return '${meaningful[meaningful.length - 2]} / ${meaningful.last}';
+      }
+      return meaningful.last;
+    }
+
+    // Fallback: build dynamic prefixes from the detected username
    final prefixes = [
-      '-Users-mathias-Documents-workspaces-',
-      '-Users-mathias-Documents-',
-      '-Users-mathias-',
+      '-Users-$username-Documents-workspaces-',
+      '-Users-$username-Documents-',
+      '-Users-$username-Workspaces-',
+      '-Users-$username-',
+      '-Volumes-Workspaces-',
+      '-Volumes-',
      '-Applications-',
    ];

-    String prefix = '';
+    String path = dirName;
    for (final p in prefixes) {
      if (path.startsWith(p)) {
-        prefix = p;
        path = path.substring(p.length);
        break;
      }
    }

-    if (path.isEmpty) {
-      if (dirName == '-Users-mathias') return '~ (home)';
-      return dirName;
-    }
-
-    // Now `path` is something like "svrnty-talos-rpi5--out-fondation"
-    // Double dashes (--) were actual dashes in folder names? No — they represent
-    // a subfolder that itself has a dash. We need to figure out the actual
-    // filesystem path. Let's just check if the reconstructed path exists.
-    final home = Platform.environment['HOME'] ?? '';
-    final reconstructed = _reconstructPath(dirName, home);
-    if (reconstructed != null) {
-      // Get last 2 meaningful segments
-      final segs = reconstructed.split('/').where((s) => s.isNotEmpty).toList();
-      // Remove common uninteresting segments
-      final skip = {'Users', 'mathias', 'Documents', 'workspaces', 'Applications', 'Contents', 'Resources'};
-      final meaningful = segs.where((s) => !skip.contains(s)).toList();
-      if (meaningful.length >= 2) {
-        return '${meaningful[meaningful.length - 2]} / ${meaningful.last}';
-      }
-      if (meaningful.isNotEmpty) return meaningful.last;
-    }
-
-    // Fallback: just clean up the raw name
+    if (path.isEmpty) return '~ (home)';
    return path.replaceAll('--', ' / ').replaceAll('-', ' ');
  }

@ -200,18 +200,48 @@ class _HomeScreenState extends State<HomeScreen> {
    return result; // return anyway as best guess
  }

+  /// Locates the Claude Code data directory.
+  /// Claude Code always stores data at ~/.claude/ regardless of where
+  /// the binary is installed (npm global, homebrew, etc).
+  Future<Directory?> _findClaudeDataDir() async {
+    final home = _getRealHome();
+    debugPrint('[Claude] HOME env: ${Platform.environment['HOME']}');
+    debugPrint('[Claude] Real home resolved to: $home');
+
+    if (home == null) {
+      debugPrint('[Claude] ERROR: Could not determine home directory');
+      return null;
+    }
+
+    final claudeDir = Directory('$home/.claude');
+    final exists = await claudeDir.exists();
+    debugPrint('[Claude] Checking ${claudeDir.path} -> exists: $exists');
+
+    if (exists) return claudeDir;
+
+    return null;
+  }
+
  Future<void> _scanProjects() async {
-    final home = Platform.environment['HOME'];
-    if (home == null) return;
-    final claudeDir = Directory('$home/.claude/projects');
-    if (!await claudeDir.exists()) {
+    final claudeData = await _findClaudeDataDir();
+    if (claudeData == null) {
+      debugPrint('[Claude] No Claude Code data directory found');
      setState(() => _scanning = false);
      return;
    }

+    final projectsDir = Directory('${claudeData.path}/projects');
+    final projExists = await projectsDir.exists();
+    debugPrint('[Claude] Projects dir: ${projectsDir.path} -> exists: $projExists');
+    if (!projExists) {
+      setState(() => _scanning = false);
+      return;
+    }
+
+    final home = _getRealHome() ?? '';
    final projects = <_Project>[];

-    await for (final projectDir in claudeDir.list()) {
+    await for (final projectDir in projectsDir.list()) {
      if (projectDir is! Directory) continue;
      final dirName = projectDir.path.split('/').last;

@ -220,27 +250,6 @@ class _HomeScreenState extends State<HomeScreen> {
      // Scan .jsonl files in the project dir
      try {
        await for (final entity in projectDir.list()) {
-          if (entity is File &&
-              entity.path.endsWith('.jsonl') &&
-              !entity.path.endsWith('sessions-index.json')) {
-            try {
-              final stat = entity.statSync();
-              final fileName = entity.path.split('/').last;
-              sessions.add(_SessionFile(
-                file: entity,
-                stat: stat,
-                sessionId: fileName.replaceAll('.jsonl', ''),
-              ));
-            } catch (_) {}
-          }
-        }
-      } catch (_) {}
-
-      // Also scan sessions/ subdirectory
-      final sessionsDir = Directory('${projectDir.path}/sessions');
-      if (await sessionsDir.exists()) {
-        try {
-          await for (final entity in sessionsDir.list()) {
          if (entity is File && entity.path.endsWith('.jsonl')) {
            try {
              final stat = entity.statSync();
@ -254,7 +263,6 @@ class _HomeScreenState extends State<HomeScreen> {
          }
        }
      } catch (_) {}
-      }

      if (sessions.isEmpty) continue;

@ -283,7 +291,7 @@ class _HomeScreenState extends State<HomeScreen> {
  }

  Future<void> _pickFile() async {
-    final home = Platform.environment['HOME'] ?? '';
+    final home = _getRealHome() ?? '';
    final result = await FilePicker.platform.pickFiles(
      type: FileType.custom,
      allowedExtensions: ['jsonl'],
--- a/lib/screens/timeline/timeline_screen.dart
+++ b/lib/screens/timeline/timeline_screen.dart
@ -1,43 +1,212 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import '../../models/agent_info.dart';
 import '../../models/log_entry.dart';
 import '../../providers/session_provider.dart';
+import '../../services/jsonl_parser.dart';
 import '../../theme/app_theme.dart';
 import 'widgets/assistant_message_card.dart';
 import 'widgets/system_message_card.dart';
 import 'widgets/user_message_card.dart';

-class TimelineScreen extends StatelessWidget {
+// ─── Flat timeline item ──────────────────────────────────────
+
+enum _TimelineItemType { userPrompt, assistantResponse, systemMessage }
+
+class _TimelineItem {
+  final _TimelineItemType type;
+  final LogEntry entry;
+  final int turnNumber;
+  final bool isFirstInTurn;
+  final bool isLastInTurn;
+
+  const _TimelineItem({
+    required this.type,
+    required this.entry,
+    required this.turnNumber,
+    this.isFirstInTurn = false,
+    this.isLastInTurn = false,
+  });
+}
+
+List<_TimelineItem> _flattenTurns(List<LogEntry> entries) {
+  final items = <_TimelineItem>[];
+  UserEntry? currentPrompt;
+  int turnNum = 0;
+  bool hadPrompt = false;
+
+  for (final entry in entries) {
+    if (entry is UserEntry && !entry.isToolResult) {
+      // Flush previous turn
+      if (hadPrompt && currentPrompt != null) {
+        // already flushed — this is a new prompt
+      }
+      if (currentPrompt != null) {
+        // The previous turn is already flushed (items added inline below)
+      }
+
+      // Emit user prompt item
+      turnNum++;
+      currentPrompt = entry;
+      hadPrompt = true;
+
+      items.add(_TimelineItem(
+        type: _TimelineItemType.userPrompt,
+        entry: entry,
+        turnNumber: turnNum,
+        isFirstInTurn: true,
+      ));
+    } else if (entry is UserEntry && entry.isToolResult) {
+      continue;
+    } else if (hadPrompt) {
+      final isAssistant = entry is AssistantEntry;
+      final isSystem = entry is SystemEntry;
+
+      items.add(_TimelineItem(
+        type: isAssistant
+            ? _TimelineItemType.assistantResponse
+            : isSystem
+                ? _TimelineItemType.systemMessage
+                : _TimelineItemType.systemMessage,
+        entry: entry,
+        turnNumber: turnNum,
+      ));
+    }
+    // else: orphaned entries before first user prompt — skip
+  }
+
+  // Mark last item in each turn
+  for (int i = 0; i < items.length; i++) {
+    final nextIsNewTurn =
+        i + 1 >= items.length || items[i + 1].isFirstInTurn;
+    if (!items[i].isFirstInTurn && nextIsNewTurn) {
+      items[i] = _TimelineItem(
+        type: items[i].type,
+        entry: items[i].entry,
+        turnNumber: items[i].turnNumber,
+        isFirstInTurn: items[i].isFirstInTurn,
+        isLastInTurn: true,
+      );
+    }
+  }
+
+  return items;
+}
+
+// ─── Turn grouping for filter bar stats ──────────────────────
+
+class ConversationTurn {
+  final UserEntry prompt;
+  final List<LogEntry> responses;
+  final int turnNumber;
+
+  ConversationTurn({
+    required this.prompt,
+    required this.responses,
+    required this.turnNumber,
+  });
+}
+
+List<ConversationTurn> groupIntoTurns(List<LogEntry> entries) {
+  final turns = <ConversationTurn>[];
+  UserEntry? currentPrompt;
+  List<LogEntry> currentResponses = [];
+  List<LogEntry> orphanedEntries = [];
+  int turnNum = 0;
+
+  for (final entry in entries) {
+    if (entry is UserEntry && !entry.isToolResult) {
+      if (currentPrompt != null) {
+        turns.add(ConversationTurn(
+          prompt: currentPrompt,
+          responses: currentResponses,
+          turnNumber: turnNum,
+        ));
+      }
+      if (orphanedEntries.isNotEmpty) {
+        currentResponses = [];
+        turnNum++;
+        currentPrompt = entry;
+        currentResponses.addAll(orphanedEntries);
+        orphanedEntries = [];
+      } else {
+        currentPrompt = entry;
+        currentResponses = [];
+        turnNum++;
+      }
+    } else if (entry is UserEntry && entry.isToolResult) {
+      continue;
+    } else if (currentPrompt != null) {
+      currentResponses.add(entry);
+    } else {
+      orphanedEntries.add(entry);
+    }
+  }
+
+  if (currentPrompt != null) {
+    turns.add(ConversationTurn(
+      prompt: currentPrompt,
+      responses: currentResponses,
+      turnNumber: turnNum,
+    ));
+  }
+
+  return turns;
+}
+
+// ─── Main screen ──────────────────────────────────────────────
+
+class TimelineScreen extends StatefulWidget {
  const TimelineScreen({super.key});

+  @override
+  State<TimelineScreen> createState() => _TimelineScreenState();
+}
+
+class _TimelineScreenState extends State<TimelineScreen> {
+  List<_TimelineItem> _cachedItems = const [];
+  List<LogEntry>? _cachedEntriesKey;
+
  @override
  Widget build(BuildContext context) {
-    final provider = context.watch<SessionProvider>();
-    final session = provider.session;
+    final session = context.select<SessionProvider, SessionLog?>((p) => p.session);
+
    if (session == null) {
      return const Center(
-        child: Text('No session loaded', style: TextStyle(color: AppColors.textMuted)),
+        child: Text('No session loaded',
+            style: TextStyle(color: AppColors.textMuted)),
      );
    }

-    final entries = provider.filteredEntries;
+    // Get filtered entries and flatten to items (cached)
+    final entries = context.select<SessionProvider, List<LogEntry>>(
+        (p) => p.filteredEntries);
+
+    // Cache the flat items list — only recompute when entries reference changes
+    if (!identical(_cachedEntriesKey, entries)) {
+      _cachedEntriesKey = entries;
+      _cachedItems = _flattenTurns(entries);
+    }

    return Scaffold(
      backgroundColor: AppColors.background,
      body: Column(
        children: [
-          _FilterBar(provider: provider),
+          const _FilterBar(),
          Expanded(
-            child: entries.isEmpty
+            child: _cachedItems.isEmpty
                ? const Center(
                    child: Text('No matching entries',
                        style: TextStyle(color: AppColors.textMuted)),
                  )
                : ListView.builder(
                    padding: const EdgeInsets.fromLTRB(24, 8, 24, 24),
-                    itemCount: entries.length,
+                    itemCount: _cachedItems.length,
+                    addRepaintBoundaries: true,
                    itemBuilder: (context, index) {
-                      return _buildEntryCard(entries[index], index);
+                      return _TimelineItemWidget(
+                        item: _cachedItems[index],
+                      );
                    },
                  ),
          ),
@ -45,38 +214,171 @@ class TimelineScreen extends StatelessWidget {
      ),
    );
  }
+}

-  Widget _buildEntryCard(LogEntry entry, int index) {
-    if (entry is UserEntry && !entry.isToolResult) {
+// ─── Timeline item widget ────────────────────────────────────
+
+class _TimelineItemWidget extends StatelessWidget {
+  final _TimelineItem item;
+
+  const _TimelineItemWidget({required this.item});
+
+  @override
+  Widget build(BuildContext context) {
+    final isPrompt = item.type == _TimelineItemType.userPrompt;
+
+    if (isPrompt) {
+      // User prompt — no tree line, just the card with turn indicator
      return Padding(
-        padding: const EdgeInsets.only(bottom: 8),
-        child: UserMessageCard(entry: entry, index: index),
+        padding: EdgeInsets.only(
+          bottom: item.isLastInTurn ? 0 : 6,
+          top: 2,
+        ),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Turn dot
+            SizedBox(
+              width: 24,
+              child: Column(
+                children: [
+                  const SizedBox(height: 14),
+                  Container(
+                    width: 10,
+                    height: 10,
+                    decoration: BoxDecoration(
+                      color: AppColors.user,
+                      shape: BoxShape.circle,
+                      boxShadow: [
+                        BoxShadow(
+                          color: AppColors.user.withAlpha(60),
+                          blurRadius: 6,
+                          spreadRadius: 1,
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.only(bottom: 10),
+                child: RepaintBoundary(
+                  child: UserMessageCard(
+                    entry: item.entry as UserEntry,
+                    index: item.turnNumber,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
      );
    }
-    if (entry is AssistantEntry) {
+
+    // Response/system — with tree connector line
    return Padding(
-        padding: const EdgeInsets.only(bottom: 8),
-        child: AssistantMessageCard(entry: entry, index: index),
+      padding: const EdgeInsets.only(bottom: 6),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          // Tree line column
+          SizedBox(
+            width: 24,
+            height: 36, // Fixed height for the connector
+            child: CustomPaint(
+              painter: _TreeLinePainter(
+                color: AppColors.user.withAlpha(60),
+                isLastChild: item.isLastInTurn,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 4),
+              child: RepaintBoundary(
+                child: _buildCard(item),
+              ),
+            ),
+          ),
+        ],
+      ),
    );
  }
-    if (entry is SystemEntry) {
-      return Padding(
-        padding: const EdgeInsets.only(bottom: 8),
-        child: SystemMessageCard(entry: entry),
+
+  Widget _buildCard(_TimelineItem item) {
+    if (item.entry is AssistantEntry) {
+      return AssistantMessageCard(
+        entry: item.entry as AssistantEntry,
+        index: item.turnNumber,
      );
    }
+    if (item.entry is SystemEntry) {
+      return SystemMessageCard(entry: item.entry as SystemEntry);
+    }
    return const SizedBox.shrink();
  }
 }

-class _FilterBar extends StatelessWidget {
-  final SessionProvider provider;
+// ─── Custom painter for tree lines ────────────────────────────

-  const _FilterBar({required this.provider});
+class _TreeLinePainter extends CustomPainter {
+  final Color color;
+  final bool isLastChild;
+
+  const _TreeLinePainter({
+    required this.color,
+    required this.isLastChild,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..strokeWidth = 2
+      ..style = PaintingStyle.stroke
+      ..strokeCap = StrokeCap.round;
+
+    final centerX = size.width / 2;
+    const connectorY = 18.0;
+
+    // Vertical line from top to connector (or to bottom if not last)
+    canvas.drawLine(
+      Offset(centerX, 0),
+      Offset(centerX, isLastChild ? connectorY : size.height),
+      paint,
+    );
+
+    // Horizontal connector to right edge
+    canvas.drawLine(
+      Offset(centerX, connectorY),
+      Offset(size.width, connectorY),
+      paint,
+    );
+  }
+
+  @override
+  bool shouldRepaint(covariant _TreeLinePainter oldDelegate) {
+    return oldDelegate.color != color || oldDelegate.isLastChild != isLastChild;
+  }
+}
+
+// ─── Filter bar ───────────────────────────────────────────────
+
+class _FilterBar extends StatelessWidget {
+  const _FilterBar();

  @override
  Widget build(BuildContext context) {
+    final provider = context.watch<SessionProvider>();
    final session = provider.session!;
+    final entries = provider.filteredEntries;
+    final turns = groupIntoTurns(entries);
+
+    // Parse errors warning
+    final parseErrors = context.select<SessionProvider, List<ParseError>>(
+        (p) => p.parseErrors);

    return Container(
      padding: const EdgeInsets.fromLTRB(24, 16, 24, 12),
@ -86,7 +388,10 @@ class _FilterBar extends StatelessWidget {
          bottom: BorderSide(color: AppColors.surfaceBorder, width: 1),
        ),
      ),
-      child: Row(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Row(
            children: [
              // Session info
              Expanded(
@ -104,12 +409,22 @@ class _FilterBar extends StatelessWidget {
                    if (session.version != null)
                      _InfoChip(label: 'v${session.version}'),
                    const SizedBox(width: 8),
-                _InfoChip(
-                    label: '${provider.filteredEntries.length} entries'),
+                    _InfoChip(label: '${turns.length} turns'),
                    const SizedBox(width: 8),
                    _InfoChip(
                        label:
                            '${_formatTokens(session.totalUsage.totalTokens)} tokens'),
+                    // Parse errors warning
+                    if (parseErrors.isNotEmpty) ...[
+                      const SizedBox(width: 8),
+                      Tooltip(
+                        message:
+                            '${parseErrors.length} lines could not be parsed',
+                        child: _InfoChip(
+                          label: '⚠ ${parseErrors.length} parse errors',
+                        ),
+                      ),
+                    ],
                  ],
                ),
              ),
@ -177,15 +492,17 @@ class _FilterBar extends StatelessWidget {
                width: 180,
                child: TextField(
                  onChanged: provider.setSearchQuery,
-              style: const TextStyle(fontSize: 12, color: AppColors.textPrimary),
+                  style: const TextStyle(
+                      fontSize: 12, color: AppColors.textPrimary),
                  decoration: InputDecoration(
                    hintText: 'Search...',
-                hintStyle:
-                    const TextStyle(fontSize: 12, color: AppColors.textMuted),
+                    hintStyle: const TextStyle(
+                        fontSize: 12, color: AppColors.textMuted),
                    prefixIcon: const Icon(Icons.search,
                        size: 16, color: AppColors.textMuted),
                    isDense: true,
-                contentPadding: const EdgeInsets.symmetric(vertical: 8),
+                    contentPadding:
+                        const EdgeInsets.symmetric(vertical: 8),
                    filled: true,
                    fillColor: AppColors.surfaceLight,
                    border: OutlineInputBorder(
@ -203,6 +520,8 @@ class _FilterBar extends StatelessWidget {
              ),
            ],
          ),
+        ],
+      ),
    );
  }

--- a/lib/screens/tokens/tokens_screen.dart
+++ b/lib/screens/tokens/tokens_screen.dart
@ -174,6 +174,7 @@ class TokensScreen extends StatelessWidget {
                  ),
                  const SizedBox(width: 24),
                  Expanded(
+                    child: SingleChildScrollView(
                      child: Column(
                      mainAxisAlignment: MainAxisAlignment.center,
                      crossAxisAlignment: CrossAxisAlignment.start,
@ -226,6 +227,7 @@ class TokensScreen extends StatelessWidget {
                      }).toList(),
                    ),
                    ),
+                  ),
                ],
              ),
            ),
--- a/lib/services/jsonl_parser.dart
+++ b/lib/services/jsonl_parser.dart
@ -1,72 +1,137 @@
 import 'dart:convert';
-import 'dart:io';
+import 'dart:io' as io;
+import 'dart:isolate';

 import '../models/agent_info.dart';
 import '../models/content_block.dart';
 import '../models/log_entry.dart';
 import '../models/token_usage.dart';

-class JsonlParser {
-  Future<SessionLog> parseFile(String filePath) async {
-    final file = File(filePath);
-    final lines = await file.readAsLines(encoding: utf8);
-
-    final entries = <LogEntry>[];
-    for (final line in lines) {
-      if (line.trim().isEmpty) continue;
-      try {
-        final json = jsonDecode(line) as Map<String, dynamic>;
-        entries.add(LogEntry.fromJson(json));
-      } catch (_) {}
+class ParseError {
+  final int? line;
+  final String? source;
+  final String error;
+  const ParseError({this.line, this.source, required this.error});
 }

-    // Resolve the subagents directory from the session file path
-    // e.g. /path/to/project/64a8386a.jsonl → /path/to/project/64a8386a/subagents/
-    final sessionFileName = file.uri.pathSegments.last.replaceAll('.jsonl', '');
-    final parentDir = file.parent.path;
-    final subagentsDir = Directory('$parentDir/$sessionFileName/subagents');
+class ParseResult {
+  final SessionLog sessionLog;
+  final List<ParseError> errors;
+  const ParseResult(this.sessionLog, this.errors);
+}
+
+class _IsolateInput {
+  final List<String> mainLines;
+  final String sessionFileName;
+  final Map<String, List<String>> subagentLines;
+  final Map<String, String> subagentMetaRaw;
+  const _IsolateInput({
+    required this.mainLines,
+    required this.sessionFileName,
+    required this.subagentLines,
+    required this.subagentMetaRaw,
+  });
+}
+
+class JsonlParser {
+  Future<ParseResult> parseFile(String filePath) async {
+    final file = io.File(filePath);
+    final mainLines = await file.readAsLines(encoding: utf8);
+
+    final sessionFileName =
+        file.uri.pathSegments.last.replaceAll('.jsonl', '');
+    final parentDir = file.parent.path;
+    final subagentsDir =
+        io.Directory('$parentDir/$sessionFileName/subagents');
+
+    final subagentLines = <String, List<String>>{};
+    final subagentMetaRaw = <String, String>{};

-    // Load all subagent .jsonl files
-    final subagentFiles = <String, List<LogEntry>>{};
-    final subagentMeta = <String, Map<String, dynamic>>{};
    if (await subagentsDir.exists()) {
      await for (final entity in subagentsDir.list()) {
-        if (entity is File && entity.path.endsWith('.jsonl')) {
+        if (entity is io.File) {
+          if (entity.path.endsWith('.jsonl')) {
            final agentFileName = entity.uri.pathSegments.last;
-          // agent-a014e30b71de602bb.jsonl → a014e30b71de602bb
            final agentId = agentFileName
                .replaceAll('.jsonl', '')
                .replaceFirst('agent-', '');
-
-          final agentEntries = <LogEntry>[];
            try {
-            final agentLines = await entity.readAsLines(encoding: utf8);
-            for (final line in agentLines) {
-              if (line.trim().isEmpty) continue;
-              try {
-                final json = jsonDecode(line) as Map<String, dynamic>;
-                agentEntries.add(LogEntry.fromJson(json));
+              final lines = await entity.readAsLines(encoding: utf8);
+              subagentLines[agentId] = lines;
            } catch (_) {}
-            }
-          } catch (_) {}
-          if (agentEntries.isNotEmpty) {
-            subagentFiles[agentId] = agentEntries;
-          }
-        } else if (entity is File && entity.path.endsWith('.meta.json')) {
-          try {
-            final metaContent = await entity.readAsString();
-            final meta = jsonDecode(metaContent) as Map<String, dynamic>;
+          } else if (entity.path.endsWith('.meta.json')) {
            final agentFileName = entity.uri.pathSegments.last;
            final agentId = agentFileName
                .replaceAll('.meta.json', '')
                .replaceFirst('agent-', '');
-            subagentMeta[agentId] = meta;
+            try {
+              subagentMetaRaw[agentId] = await entity.readAsString();
            } catch (_) {}
          }
        }
      }
+    }

-    return _buildSessionLog(entries, subagentFiles, subagentMeta);
+    // Run CPU-bound parsing in a background isolate
+    return Isolate.run(
+      () => _parseInIsolate(_IsolateInput(
+        mainLines: mainLines,
+        sessionFileName: sessionFileName,
+        subagentLines: subagentLines,
+        subagentMetaRaw: subagentMetaRaw,
+      )),
+    );
+  }
+}
+
+ParseResult _parseInIsolate(_IsolateInput input) {
+  final errors = <ParseError>[];
+  final entries = <LogEntry>[];
+
+  for (var i = 0; i < input.mainLines.length; i++) {
+    final line = input.mainLines[i];
+    if (line.trim().isEmpty) continue;
+    try {
+      final json = jsonDecode(line) as Map<String, dynamic>;
+      entries.add(LogEntry.fromJson(json));
+    } catch (e) {
+      errors.add(ParseError(line: i, error: e.toString()));
+    }
+  }
+
+  // Parse subagent entries
+  final subagentFiles = <String, List<LogEntry>>{};
+  for (final entry in input.subagentLines.entries) {
+    final agentEntries = <LogEntry>[];
+    for (var i = 0; i < entry.value.length; i++) {
+      final line = entry.value[i];
+      if (line.trim().isEmpty) continue;
+      try {
+        final json = jsonDecode(line) as Map<String, dynamic>;
+        agentEntries.add(LogEntry.fromJson(json));
+      } catch (e) {
+        errors.add(ParseError(
+            line: i, source: entry.key, error: e.toString()));
+      }
+    }
+    if (agentEntries.isNotEmpty) {
+      subagentFiles[entry.key] = agentEntries;
+    }
+  }
+
+  // Parse subagent metadata
+  final subagentMeta = <String, Map<String, dynamic>>{};
+  for (final entry in input.subagentMetaRaw.entries) {
+    try {
+      subagentMeta[entry.key] =
+          jsonDecode(entry.value) as Map<String, dynamic>;
+    } catch (e) {
+      errors.add(ParseError(source: entry.key, error: e.toString()));
+    }
+  }
+
+  final sessionLog = _buildSessionLog(entries, subagentFiles, subagentMeta);
+  return ParseResult(sessionLog, errors);
 }

 SessionLog _buildSessionLog(
@ -86,34 +151,24 @@ class JsonlParser {
    }
  }

-    // Link tool results to tool use blocks in main session
  _linkToolResults(entries);
-
-    // Link tool results inside each subagent session
  for (final agentEntries in subagentFiles.values) {
    _linkToolResults(agentEntries);
  }

-    // Separate main conversation from progress entries
  final mainConversation = entries
-        .where((e) => e.type != 'progress' && e.type != 'file-history-snapshot')
+      .where(
+          (e) => e.type != 'progress' && e.type != 'file-history-snapshot')
      .toList();

-    // Build agent info
-    final agents = _buildAgents(
-      mainConversation,
-      subagentFiles,
-      subagentMeta,
-    );
+  final agents = _buildAgents(mainConversation, subagentFiles, subagentMeta);
  final mainAgent = agents.firstWhere((a) => a.id == 'main');

-    // Compute total usage
  var totalUsage = const TokenUsage();
  for (final agent in agents) {
    totalUsage = totalUsage + agent.aggregatedUsage;
  }

-    // Build tools by name index
  final toolsByName = <String, List<ToolUseBlock>>{};
  for (final agent in agents) {
    for (final tool in agent.toolsUsed) {
@ -121,7 +176,6 @@ class JsonlParser {
    }
  }

-    // Timestamps
  final timestamps = entries
      .where((e) => e.timestamp != null)
      .map((e) => e.timestamp!)
@ -169,7 +223,6 @@ class JsonlParser {
 ) {
  final agents = <AgentInfo>[];

-    // Main agent tools and usage
  final mainToolUses = <ToolUseBlock>[];
  String? mainModel;
  var mainUsage = const TokenUsage();
@ -197,7 +250,6 @@ class JsonlParser {
    aggregatedUsage: mainUsage,
  ));

-    // Find Agent tool calls from the main conversation to get descriptions
  final agentToolCalls = <String, ToolUseBlock>{};
  for (final entry in mainEntries) {
    if (entry is AssistantEntry) {
@ -209,13 +261,11 @@ class JsonlParser {
    }
  }

-    // Build subagent infos from the actual subagent .jsonl files
  for (final entry in subagentFiles.entries) {
    final agentId = entry.key;
    final agentEntries = entry.value;
    final meta = subagentMeta[agentId] ?? {};

-      // Extract tool uses, model, and usage from subagent entries
    final subToolUses = <ToolUseBlock>[];
    var subUsage = const TokenUsage();
    String? subModel;
@ -234,8 +284,6 @@ class JsonlParser {
      }
    }

-      // Try to match this subagent to an Agent tool call for description/prompt.
-      // The agentId in the file might be a prefix of the tool_use id.
    ToolUseBlock? matchedCall;
    for (final call in agentToolCalls.entries) {
      if (call.key.contains(agentId) || agentId.contains(call.key)) {
@ -244,7 +292,6 @@ class JsonlParser {
      }
    }

-      // Also check the slug from the first entry to match
    String? slug;
    for (final e in agentEntries) {
      if (e.raw.containsKey('slug')) {
@ -253,12 +300,10 @@ class JsonlParser {
      }
    }

-      final agentType = meta['agentType'] as String? ??
-          matchedCall?.subagentType;
-      final description = matchedCall?.agentDescription ??
-          slug ??
-          agentType ??
-          'Subagent';
+    final agentType =
+        meta['agentType'] as String? ?? matchedCall?.subagentType;
+    final description =
+        matchedCall?.agentDescription ?? slug ?? agentType ?? 'Subagent';

    agents.add(AgentInfo(
      id: agentId,
@ -275,4 +320,3 @@ class JsonlParser {

  return agents;
 }
-}
--- a/lib/widgets/common/expandable_card.dart
+++ b/lib/widgets/common/expandable_card.dart
@ -26,11 +26,13 @@ class _ExpandableCardState extends State<ExpandableCard>
  late bool _expanded;
  late AnimationController _controller;
  late Animation<double> _rotation;
+  bool _hasBeenExpanded = false; // Track if ever expanded to lazy-build

  @override
  void initState() {
    super.initState();
    _expanded = widget.initiallyExpanded;
+    _hasBeenExpanded = _expanded;
    _controller = AnimationController(
      duration: const Duration(milliseconds: 200),
      vsync: this,
@ -51,6 +53,7 @@ class _ExpandableCardState extends State<ExpandableCard>
    setState(() {
      _expanded = !_expanded;
      if (_expanded) {
+        _hasBeenExpanded = true;
        _controller.forward();
      } else {
        _controller.reverse();
@ -76,7 +79,8 @@ class _ExpandableCardState extends State<ExpandableCard>
            onTap: _toggle,
            borderRadius: BorderRadius.circular(8),
            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
              child: Row(
                children: [
                  RotationTransition(
@ -93,17 +97,16 @@ class _ExpandableCardState extends State<ExpandableCard>
              ),
            ),
          ),
+          // Lazy animated expand: only build child once ever expanded
+          if (_hasBeenExpanded)
            ClipRect(
-            child: AnimatedCrossFade(
-              firstChild: const SizedBox.shrink(),
-              secondChild: Padding(
+              child: SizeTransition(
+                sizeFactor: _controller,
+                axisAlignment: -1.0,
+                child: Padding(
                  padding: const EdgeInsets.fromLTRB(12, 0, 12, 12),
                  child: widget.child,
                ),
-              crossFadeState: _expanded
-                  ? CrossFadeState.showSecond
-                  : CrossFadeState.showFirst,
-              duration: const Duration(milliseconds: 200),
              ),
            ),
        ],
--- a/lib/widgets/navigation/app_shell.dart
+++ b/lib/widgets/navigation/app_shell.dart
@ -39,24 +39,18 @@ class _AppShellState extends State<AppShell> {
          hasSession: hasSession,
        ),
        Expanded(
-          child: _buildScreen(),
+          child: IndexedStack(
+            index: _screen.index,
+            children: [
+              HomeScreen(onSessionLoaded: _onSessionLoaded),
+              const TimelineScreen(),
+              const AgentsScreen(),
+              const ToolbeltScreen(),
+              const TokensScreen(),
+            ],
+          ),
        ),
      ],
    );
  }
-
-  Widget _buildScreen() {
-    switch (_screen) {
-      case SidebarScreen.home:
-        return HomeScreen(onSessionLoaded: _onSessionLoaded);
-      case SidebarScreen.timeline:
-        return const TimelineScreen();
-      case SidebarScreen.agents:
-        return const AgentsScreen();
-      case SidebarScreen.toolbelt:
-        return const ToolbeltScreen();
-      case SidebarScreen.tokens:
-        return const TokensScreen();
-    }
-  }
 }
--- a/lib/widgets/navigation/sidebar.dart
+++ b/lib/widgets/navigation/sidebar.dart
@ -48,7 +48,7 @@ class Sidebar extends StatelessWidget {
                ),
                const SizedBox(width: 10),
                const Text(
-                  'Session Viewer',
+                  'Session Analysis',
                  style: TextStyle(
                    fontSize: 14,
                    fontWeight: FontWeight.w600,
@ -107,7 +107,7 @@ class Sidebar extends StatelessWidget {
          Padding(
            padding: const EdgeInsets.all(16),
            child: Text(
-              'Claude Session Viewer v0.1',
+              'Claude Session Analysis v1.0',
              style: TextStyle(
                fontSize: 10,
                color: AppColors.textMuted.withAlpha(128),
--- a/macos/Podfile
+++ b/macos/Podfile
@ -1,4 +1,4 @@
-platform :osx, '10.15'
+platform :osx, '13.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -1,29 +1,16 @@
 PODS:
-  - file_picker (0.0.1):
-    - FlutterMacOS
  - FlutterMacOS (1.0.0)
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS

 DEPENDENCIES:
-  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
-  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)

 EXTERNAL SOURCES:
-  file_picker:
-    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
  FlutterMacOS:
    :path: Flutter/ephemeral
-  shared_preferences_foundation:
-    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin

 SPEC CHECKSUMS:
-  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb

-PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
+PODFILE CHECKSUM: 89c84cf5c2351c1e554c6dea18d31a879fc3a19e

 COCOAPODS: 1.16.2
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@ -27,6 +27,7 @@
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
+		33CC10FF2044A3C60003C045 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10FE2044A3C60003C045 /* PrivacyInfo.xcprivacy */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		79F3DEC2140214566E19F388 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB8C54BF040E1E6BF05BCBD /* Pods_RunnerTests.framework */; };
@ -68,7 +69,7 @@
 		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* claude_session_viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = claude_session_viewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* Claude Session Analysis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Claude Session Analysis.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@ -77,6 +78,7 @@
 		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
 		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
 		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
+		33CC10FE2044A3C60003C045 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
@ -147,7 +149,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* claude_session_viewer.app */,
+				33CC10ED2044A3C60003C045 /* Claude Session Analysis.app */,
 				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
@ -181,6 +183,7 @@
 			children = (
 				33CC10F02044A3C60003C045 /* AppDelegate.swift */,
 				33CC11122044BFA00003C045 /* MainFlutterWindow.swift */,
+				33CC10FE2044A3C60003C045 /* PrivacyInfo.xcprivacy */,
 				33E51913231747F40026EE4D /* DebugProfile.entitlements */,
 				33E51914231749380026EE4D /* Release.entitlements */,
 				33CC11242044D66E0003C045 /* Resources */,
@ -244,7 +247,6 @@
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				2C302F33045D329C15CB5562 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@ -256,7 +258,7 @@
 				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
 			);
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* claude_session_viewer.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* Claude Session Analysis.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@ -327,29 +329,13 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+				33CC10FF2044A3C60003C045 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		2C302F33045D329C15CB5562 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		2D5E86AC9DD4210FFD8C9DE8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -489,10 +475,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionViewer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionAnalysis.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/claude_session_viewer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/claude_session_viewer";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Claude Session Analysis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Claude Session Analysis";
 			};
 			name = Debug;
 		};
@ -504,10 +490,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionViewer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionAnalysis.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/claude_session_viewer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/claude_session_viewer";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Claude Session Analysis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Claude Session Analysis";
 			};
 			name = Release;
 		};
@ -519,10 +505,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionViewer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionAnalysis.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/claude_session_viewer.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/claude_session_viewer";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Claude Session Analysis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Claude Session Analysis";
 			};
 			name = Profile;
 		};
@ -567,7 +553,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@ -649,7 +635,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@ -685,7 +671,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@ -699,7 +685,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@ -734,7 +720,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = LD76P8L42W;
+				ENABLE_HARDENED_RUNTIME = YES;
+				OTHER_CODE_SIGN_FLAGS = "--timestamp --options runtime";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
--- a/macos/Runner/Configs/AppInfo.xcconfig
+++ b/macos/Runner/Configs/AppInfo.xcconfig
@ -5,10 +5,10 @@
 // 'flutter create' template.

 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = claude_session_viewer
+PRODUCT_NAME = Claude Session Viewer

 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claudeSessionViewer
+PRODUCT_BUNDLE_IDENTIFIER = com.svrnty.claude-session-viewer

 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2026 com.svrnty. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2026 Svrnty. All rights reserved.
--- a/macos/Runner/Info.plist
+++ b/macos/Runner/Info.plist
@ -22,6 +22,8 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>$(PRODUCT_COPYRIGHT)</string>
 	<key>NSMainNibFile</key>
--- a/macos/Runner/MainFlutterWindow.swift
+++ b/macos/Runner/MainFlutterWindow.swift
@ -8,7 +8,7 @@ class MainFlutterWindow: NSWindow {
    self.contentViewController = flutterViewController
    self.setFrame(windowFrame, display: true)
    self.minSize = NSSize(width: 1200, height: 700)
-    self.title = "Claude Session Viewer"
+    self.title = "Claude Session Analysis"

    RegisterGeneratedPlugins(registry: flutterViewController)

--- a/macos/Runner/PrivacyInfo.xcprivacy
+++ b/macos/Runner/PrivacyInfo.xcprivacy
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
--- a/pubspec.lock
+++ b/pubspec.lock
@ -29,10 +29,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
  clock:
    dependency: transitive
    description:
@ -276,18 +276,18 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.17"
+    version: "0.12.19"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
  meta:
    dependency: transitive
    description:
@ -521,10 +521,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.7"
+    version: "0.7.10"
  typed_data:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,5 +1,5 @@
-name: claude_session_viewer
-description: "A new Flutter project."
+name: claude_session_analysis
+description: "Analyze and explore Claude Code session transcripts with rich visualizations, token usage tracking, and agent timeline views."
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@ -1,9 +1,9 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:claude_session_viewer/main.dart';
+import 'package:claude_session_analysis/main.dart';

 void main() {
  testWidgets('App launches', (WidgetTester tester) async {
-    await tester.pumpWidget(const ClaudeSessionViewerApp());
-    expect(find.text('Claude Session Viewer'), findsOneWidget);
+    await tester.pumpWidget(const ClaudeSessionAnalysisApp());
+    expect(find.text('Claude Session Analysis'), findsOneWidget);
  });
 }