feat(chat): render tool-call chips and live peek status in mobile bubbles

The mobile app was receiving SSE status events but showing the peek text
only while the assistant bubble was empty — as soon as the first token
arrived, the status line was replaced by streaming content and any tool
calls fired mid-turn left no trace. Tool call SSE events were also being
dropped by the parser, and Message.fromJson never read the persisted
tool_calls array, so chips never rendered after reload either.

Parse tool_call SSE frames into a new ChatToolCall event, carry tool
calls on Message, and update the chat and briefing streaming loops to
append chips to the in-flight assistant message as they arrive. Rework
ChatMessageBubble to show a chip row + rolling peek status line above
any streamed text, matching the web ToolCallCard/status indicator
behaviour across chat, briefing, and briefing history surfaces.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-13 17:48:16 -04:00
parent 6771ec5e81
commit a3fe0b4b61
7 changed files with 297 additions and 57 deletions
+17
View File
@@ -18,6 +18,15 @@ class ChatStatusUpdate extends ChatStreamEvent {
ChatStatusUpdate(this.status); ChatStatusUpdate(this.status);
} }
/// A single tool call fired during generation. Mirrors the `tool_call` SSE
/// event emitted by `generation_task.py` and the `tool_calls` array persisted
/// on the assistant Message row — same shape either way so the UI can render
/// live chips during streaming and re-render them from storage after reload.
class ChatToolCall extends ChatStreamEvent {
final Map<String, dynamic> toolCall;
ChatToolCall(this.toolCall);
}
class ChatApi { class ChatApi {
final Dio _dio; final Dio _dio;
const ChatApi(this._dio); const ChatApi(this._dio);
@@ -136,6 +145,14 @@ class ChatApi {
} catch (_) { } catch (_) {
// Ignore malformed status events // Ignore malformed status events
} }
} else if (currentEvent == 'tool_call') {
try {
final obj = json.decode(data) as Map<String, dynamic>;
final tc = obj['tool_call'];
if (tc is Map<String, dynamic>) yield ChatToolCall(tc);
} catch (_) {
// Ignore malformed tool_call events
}
} }
} else if (line.isEmpty) { } else if (line.isEmpty) {
currentEvent = ''; // blank line = SSE event separator currentEvent = ''; // blank line = SSE event separator
+36 -12
View File
@@ -8,6 +8,11 @@ class Message {
final String status; // "complete" | "generating" final String status; // "complete" | "generating"
final DateTime? createdAt; final DateTime? createdAt;
final Map<String, dynamic>? metadata; final Map<String, dynamic>? metadata;
// Tool invocations attached to this message. Each entry matches the shape
// persisted by the backend (`function`, `arguments`, `result`, `status`) so
// the UI can render the same chips whether they arrive live over SSE or
// from a reload.
final List<Map<String, dynamic>>? toolCalls;
const Message({ const Message({
this.id, this.id,
@@ -17,21 +22,39 @@ class Message {
this.status = 'complete', this.status = 'complete',
this.createdAt, this.createdAt,
this.metadata, this.metadata,
this.toolCalls,
}); });
factory Message.fromJson(Map<String, dynamic> json) => Message( factory Message.fromJson(Map<String, dynamic> json) {
id: json['id'] as int?, final rawCalls = json['tool_calls'];
conversationId: json['conversation_id'] as int, List<Map<String, dynamic>>? parsedCalls;
role: json['role'] == 'user' ? MessageRole.user : MessageRole.assistant, if (rawCalls is List) {
content: json['content'] as String, parsedCalls = [
status: json['status'] as String? ?? 'complete', for (final tc in rawCalls)
createdAt: json['created_at'] != null if (tc is Map<String, dynamic>) tc,
? DateTime.parse(json['created_at'] as String) ];
: null, if (parsedCalls.isEmpty) parsedCalls = null;
metadata: json['metadata'] as Map<String, dynamic>?, }
); return Message(
id: json['id'] as int?,
conversationId: json['conversation_id'] as int,
role: json['role'] == 'user' ? MessageRole.user : MessageRole.assistant,
content: json['content'] as String,
status: json['status'] as String? ?? 'complete',
createdAt: json['created_at'] != null
? DateTime.parse(json['created_at'] as String)
: null,
metadata: json['metadata'] as Map<String, dynamic>?,
toolCalls: parsedCalls,
);
}
Message copyWith({String? content, String? status}) => Message( Message copyWith({
String? content,
String? status,
List<Map<String, dynamic>>? toolCalls,
}) =>
Message(
id: id, id: id,
conversationId: conversationId, conversationId: conversationId,
role: role, role: role,
@@ -39,5 +62,6 @@ class Message {
status: status ?? this.status, status: status ?? this.status,
createdAt: createdAt, createdAt: createdAt,
metadata: metadata, metadata: metadata,
toolCalls: toolCalls ?? this.toolCalls,
); );
} }
+2 -1
View File
@@ -1,5 +1,6 @@
import '../api/chat_api.dart'; import '../api/chat_api.dart';
export '../api/chat_api.dart' show ChatStreamEvent, ChatTextChunk, ChatStatusUpdate; export '../api/chat_api.dart'
show ChatStreamEvent, ChatTextChunk, ChatStatusUpdate, ChatToolCall;
import '../models/conversation.dart'; import '../models/conversation.dart';
import '../models/message.dart'; import '../models/message.dart';
+28 -12
View File
@@ -81,16 +81,24 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
bool streamedContent = false; bool streamedContent = false;
try { try {
await for (final event in chatApi.streamGeneration(convId)) { await for (final event in chatApi.streamGeneration(convId)) {
if (event is! ChatTextChunk) continue;
streamedContent = true;
final current = state.value; final current = state.value;
if (current == null) break; if (current == null) break;
final msgs = current.messages; final msgs = current.messages;
if (msgs.isEmpty) continue; if (msgs.isEmpty) continue;
final updated = if (event is ChatTextChunk) {
msgs.last.copyWith(content: msgs.last.content + event.text); streamedContent = true;
state = AsyncData(current.copyWith( final updated =
messages: [...msgs.sublist(0, msgs.length - 1), updated])); msgs.last.copyWith(content: msgs.last.content + event.text);
state = AsyncData(current.copyWith(
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
} else if (event is ChatToolCall) {
final last = msgs.last;
if (last.role != MessageRole.assistant) continue;
final nextCalls = [...?last.toolCalls, event.toolCall];
final updated = last.copyWith(toolCalls: nextCalls);
state = AsyncData(current.copyWith(
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
}
} }
} catch (_) { } catch (_) {
// Fall through to polling. // Fall through to polling.
@@ -169,16 +177,24 @@ class BriefingNotifier extends AsyncNotifier<BriefingConversation> {
bool streamedContent = false; bool streamedContent = false;
try { try {
await for (final event in chatApi.streamGeneration(convId)) { await for (final event in chatApi.streamGeneration(convId)) {
if (event is! ChatTextChunk) continue;
streamedContent = true;
final current = state.value; final current = state.value;
if (current == null) break; if (current == null) break;
final msgs = current.messages; final msgs = current.messages;
if (msgs.isEmpty) continue; if (msgs.isEmpty) continue;
final updated = if (event is ChatTextChunk) {
msgs.last.copyWith(content: msgs.last.content + event.text); streamedContent = true;
state = AsyncData(current.copyWith( final updated =
messages: [...msgs.sublist(0, msgs.length - 1), updated])); msgs.last.copyWith(content: msgs.last.content + event.text);
state = AsyncData(current.copyWith(
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
} else if (event is ChatToolCall) {
final last = msgs.last;
if (last.role != MessageRole.assistant) continue;
final nextCalls = [...?last.toolCalls, event.toolCall];
final updated = last.copyWith(toolCalls: nextCalls);
state = AsyncData(current.copyWith(
messages: [...msgs.sublist(0, msgs.length - 1), updated]));
}
} }
} catch (_) { } catch (_) {
// Fall through to polling. // Fall through to polling.
+12
View File
@@ -143,6 +143,18 @@ class MessagesNotifier extends AsyncNotifier<List<Message>> {
} else if (event is ChatStatusUpdate) { } else if (event is ChatStatusUpdate) {
ref.read(streamingStatusProvider(convId).notifier).state = ref.read(streamingStatusProvider(convId).notifier).state =
event.status; event.status;
} else if (event is ChatToolCall) {
// Append the tool call to the in-flight assistant message so the
// chip appears live. The reload pass at the end of this function
// will overwrite with the persisted version, which carries the
// same shape — no de-dup needed.
final msgs = state.requireValue;
if (msgs.isEmpty) continue;
final last = msgs.last;
if (last.role != MessageRole.assistant) continue;
final nextCalls = [...?last.toolCalls, event.toolCall];
final updated = last.copyWith(toolCalls: nextCalls);
state = AsyncData([...msgs.sublist(0, msgs.length - 1), updated]);
} }
} }
} catch (_) { } catch (_) {
+93 -32
View File
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
import '../data/models/message.dart'; import '../data/models/message.dart';
import 'tool_call_chip.dart';
class ChatMessageBubble extends StatelessWidget { class ChatMessageBubble extends StatelessWidget {
final Message message; final Message message;
@@ -19,6 +20,12 @@ class ChatMessageBubble extends StatelessWidget {
final isUser = message.role == MessageRole.user; final isUser = message.role == MessageRole.user;
final scheme = Theme.of(context).colorScheme; final scheme = Theme.of(context).colorScheme;
final isGenerating = message.status == 'generating'; final isGenerating = message.status == 'generating';
final toolCalls = message.toolCalls ?? const [];
// An assistant bubble with no text, no tool calls, and still generating
// falls back to the spinner+status "waiting for the first token" view.
final showSpinnerOnly =
isGenerating && message.content.isEmpty && toolCalls.isEmpty;
return Align( return Align(
alignment: isUser ? Alignment.centerRight : Alignment.centerLeft, alignment: isUser ? Alignment.centerRight : Alignment.centerLeft,
@@ -29,7 +36,6 @@ class ChatMessageBubble extends StatelessWidget {
margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 4), margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 4),
decoration: isUser decoration: isUser
? BoxDecoration( ? BoxDecoration(
// Ghost style: transparent bg, thin border
color: Colors.transparent, color: Colors.transparent,
border: Border.all( border: Border.all(
color: scheme.primary.withValues(alpha: 0.35), color: scheme.primary.withValues(alpha: 0.35),
@@ -43,7 +49,6 @@ class ChatMessageBubble extends StatelessWidget {
), ),
) )
: BoxDecoration( : BoxDecoration(
// Assistant: elevated surface + left accent border
color: scheme.surfaceContainerHighest, color: scheme.surfaceContainerHighest,
border: Border( border: Border(
left: BorderSide(color: scheme.primary, width: 2), left: BorderSide(color: scheme.primary, width: 2),
@@ -57,46 +62,102 @@ class ChatMessageBubble extends StatelessWidget {
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
child: isGenerating && message.content.isEmpty child: showSpinnerOnly
? Row( ? _buildSpinner(scheme)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SizedBox( // Accumulated tool-call chips: visible both during
width: 16, // streaming (fed live over SSE) and after reload (from
height: 16, // the persisted message.tool_calls array).
child: CircularProgressIndicator( if (toolCalls.isNotEmpty) ...[
strokeWidth: 2, Wrap(
color: scheme.onSurfaceVariant, spacing: 6,
runSpacing: 6,
children: [
for (final tc in toolCalls) ToolCallChip(toolCall: tc),
],
), ),
), const SizedBox(height: 6),
if (streamingStatus.isNotEmpty) ...[ ],
const SizedBox(width: 8), // Rolling status line — shows backend stage text
Flexible( // ("Creating note", "Searching calendar") while the
child: Text( // model is between tool rounds or just before the
streamingStatus, // first token. Stays above any already-streamed text
style: TextStyle( // so the user can see what's happening mid-turn.
fontSize: 12, if (isGenerating && streamingStatus.isNotEmpty) ...[
color: scheme.onSurfaceVariant, Row(
fontStyle: FontStyle.italic, mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 1.5,
color: scheme.onSurfaceVariant,
),
),
const SizedBox(width: 6),
Flexible(
child: Text(
streamingStatus,
style: TextStyle(
fontSize: 11,
color: scheme.onSurfaceVariant,
fontStyle: FontStyle.italic,
),
),
),
],
),
const SizedBox(height: 6),
],
if (message.content.isNotEmpty)
MarkdownBody(
data: message.content,
styleSheet: MarkdownStyleSheet(
p: TextStyle(
color: isUser
? scheme.onSurface.withValues(alpha: 0.75)
: scheme.onSurface,
fontSize: 14,
), ),
), ),
), ),
],
], ],
)
: MarkdownBody(
data: message.content.isEmpty ? '' : message.content,
styleSheet: MarkdownStyleSheet(
p: TextStyle(
color: isUser
? scheme.onSurface.withValues(alpha: 0.75)
: scheme.onSurface,
fontSize: 14,
),
),
), ),
), ),
), ),
); );
} }
Widget _buildSpinner(ColorScheme scheme) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2,
color: scheme.onSurfaceVariant,
),
),
if (streamingStatus.isNotEmpty) ...[
const SizedBox(width: 8),
Flexible(
child: Text(
streamingStatus,
style: TextStyle(
fontSize: 12,
color: scheme.onSurfaceVariant,
fontStyle: FontStyle.italic,
),
),
),
],
],
);
}
} }
+109
View File
@@ -0,0 +1,109 @@
import 'package:flutter/material.dart';
/// Human-readable labels for each backend tool. Kept in sync with
/// `_TOOL_LABELS` in `fabledassistant/services/generation_task.py` so the
/// mobile chips use the same wording as the web ToolCallCard status pills.
const Map<String, String> _toolLabels = {
'create_note': 'Created note',
'update_note': 'Updated note',
'delete_note': 'Deleted note',
'create_task': 'Created task',
'update_task': 'Updated task',
'delete_task': 'Deleted task',
'read_note': 'Read note',
'list_notes': 'Listed notes',
'list_tasks': 'Searched tasks',
'search_notes': 'Searched notes',
'create_event': 'Created event',
'list_events': 'Searched calendar',
'search_events': 'Searched calendar',
'update_event': 'Updated event',
'delete_event': 'Removed event',
'list_calendars': 'Listed calendars',
'search_web': 'Searched the web',
'research_topic': 'Researched topic',
'search_images': 'Searched images',
'create_project': 'Created project',
'update_project': 'Updated project',
'list_projects': 'Listed projects',
'get_project': 'Read project',
'search_projects': 'Searched projects',
'create_milestone': 'Created milestone',
'update_milestone': 'Updated milestone',
'list_milestones': 'Listed milestones',
'set_rag_scope': 'Changed knowledge scope',
'calculate': 'Calculated',
'read_article': 'Read article',
'get_profile': 'Read profile',
'update_profile': 'Updated profile',
'update_person': 'Updated person',
'update_place': 'Updated place',
'add_task_log': 'Logged task progress',
};
IconData _iconFor(String fn) {
if (fn.contains('note')) return Icons.sticky_note_2_outlined;
if (fn.contains('task')) return Icons.check_circle_outline;
if (fn.contains('event') || fn.contains('calendar')) {
return Icons.event_outlined;
}
if (fn.contains('project')) return Icons.folder_outlined;
if (fn.contains('milestone')) return Icons.flag_outlined;
if (fn.contains('web') || fn.contains('research') || fn.contains('article')) {
return Icons.public;
}
if (fn.contains('image')) return Icons.image_outlined;
if (fn.contains('person') || fn.contains('profile')) {
return Icons.person_outline;
}
if (fn.contains('place')) return Icons.place_outlined;
if (fn.contains('rag') || fn.contains('scope')) return Icons.tune;
if (fn.contains('calculate')) return Icons.calculate_outlined;
return Icons.auto_awesome;
}
/// Small status pill rendered inside an assistant message bubble for each
/// tool invocation. Mirrors the web app's ToolCallCard header at a glance —
/// icon + label + success/error tint.
class ToolCallChip extends StatelessWidget {
final Map<String, dynamic> toolCall;
const ToolCallChip({super.key, required this.toolCall});
@override
Widget build(BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final function = (toolCall['function'] as String?) ?? 'tool';
final status = (toolCall['status'] as String?) ?? 'success';
final isError = status == 'error';
final label = _toolLabels[function] ?? function;
final bg = isError
? scheme.errorContainer.withValues(alpha: 0.55)
: scheme.primary.withValues(alpha: 0.12);
final fg = isError ? scheme.onErrorContainer : scheme.primary;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: bg,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: fg.withValues(alpha: 0.35), width: 0.5),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(_iconFor(function), size: 13, color: fg),
const SizedBox(width: 5),
Text(
label,
style: TextStyle(
fontSize: 11,
color: fg,
fontWeight: FontWeight.w500,
),
),
],
),
);
}
}