feat(agent): add voice input capability and standardize tool naming
- Add voice recording with transcribe endpoint (ASR) for multimodal input - Android: add RECORD_AUDIO and INTERNET permissions - Refactor tool naming: frontend tools use 'front.' prefix, backend tools use 'back.' - Migrate calendar tools: create_calendar_event -> back.mutate/list/delete events - Add calendar_event_list.v1 and calendar_operation.v1 UI card types - Update all Flutter and Python tests to match new tool naming conventions - Add record package dependency for voice recording
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
|
||||
<application
|
||||
android:label="social_app"
|
||||
android:name="${applicationName}"
|
||||
|
||||
@@ -82,7 +82,9 @@ class AiDecisionEngine {
|
||||
}
|
||||
|
||||
ForceTriggerResult? tryForceTrigger(String text) {
|
||||
final match = RegExp(r'#tool:(\w+)\s*(\{.*\})?').firstMatch(text);
|
||||
final match = RegExp(
|
||||
r'#tool:([A-Za-z0-9_.-]+)\s*(\{.*\})?',
|
||||
).firstMatch(text);
|
||||
if (match == null) return null;
|
||||
|
||||
final toolName = match.group(1)!;
|
||||
|
||||
@@ -297,6 +297,14 @@ class ToolCallResultEvent extends AgUiEvent {
|
||||
if (rawUi is Map<String, dynamic>) {
|
||||
return UiCard.fromJson(rawUi);
|
||||
}
|
||||
final rawResult = payload['result'];
|
||||
if (rawResult is Map<String, dynamic>) {
|
||||
final type = rawResult['type'];
|
||||
final data = rawResult['data'];
|
||||
if (type is String && data is Map<String, dynamic>) {
|
||||
return UiCard.fromJson(rawResult);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@ import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:social_app/core/api/i_api_client.dart';
|
||||
import 'package:social_app/core/api/mock_api_client.dart';
|
||||
|
||||
import '../ai/ai_decision_engine.dart';
|
||||
import '../models/ag_ui_event.dart';
|
||||
import '../models/tool_result.dart';
|
||||
import '../tools/tool_registry.dart';
|
||||
import 'mock_history_service.dart';
|
||||
|
||||
@@ -36,7 +36,7 @@ class AgUiService {
|
||||
_decisionEngine = AiDecisionEngine(),
|
||||
_historyService = MockHistoryService() {
|
||||
if (_apiClient is MockApiClient) {
|
||||
_configureMockAgentApi(_apiClient as MockApiClient);
|
||||
_configureMockAgentApi(_apiClient);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,6 +77,28 @@ class AgUiService {
|
||||
onEvent(event);
|
||||
}
|
||||
|
||||
Future<String> transcribeAudio(String filePath) async {
|
||||
final formData = FormData.fromMap({
|
||||
'audio': await MultipartFile.fromFile(
|
||||
filePath,
|
||||
filename: 'recording.wav',
|
||||
),
|
||||
});
|
||||
final response = await _apiClient.post<Map<String, dynamic>>(
|
||||
'/api/v1/agent/transcribe',
|
||||
data: formData,
|
||||
);
|
||||
final payload = response.data;
|
||||
if (payload is! Map<String, dynamic>) {
|
||||
throw StateError('Invalid /agent/transcribe response');
|
||||
}
|
||||
final transcript = payload['transcript'];
|
||||
if (transcript is! String) {
|
||||
throw StateError('Missing transcript in /agent/transcribe response');
|
||||
}
|
||||
return transcript;
|
||||
}
|
||||
|
||||
Future<void> approveToolCall({
|
||||
required String toolCallId,
|
||||
required String toolName,
|
||||
@@ -210,11 +232,7 @@ class AgUiService {
|
||||
'runId': runId,
|
||||
'state': <String, dynamic>{},
|
||||
'messages': [
|
||||
{
|
||||
'id': _nextId('user_'),
|
||||
'role': 'user',
|
||||
'content': content,
|
||||
},
|
||||
{'id': _nextId('user_'), 'role': 'user', 'content': content},
|
||||
],
|
||||
'tools': _buildTools(),
|
||||
'context': <Map<String, dynamic>>[],
|
||||
@@ -225,33 +243,20 @@ class AgUiService {
|
||||
List<Map<String, dynamic>> _buildTools() {
|
||||
return [
|
||||
{
|
||||
'name': 'navigate_to_route',
|
||||
'name': 'front.navigate_to_route',
|
||||
'description': 'Navigate user to a route in the mobile app.',
|
||||
'parameters': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'target': {'type': 'string', 'description': 'Route path target'},
|
||||
'replace': {'type': 'boolean', 'description': 'Use replace navigation'},
|
||||
'replace': {
|
||||
'type': 'boolean',
|
||||
'description': 'Use replace navigation',
|
||||
},
|
||||
},
|
||||
'required': ['target'],
|
||||
},
|
||||
},
|
||||
{
|
||||
'name': 'create_calendar_event',
|
||||
'description': 'Create a calendar schedule event.',
|
||||
'parameters': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'title': {'type': 'string'},
|
||||
'description': {'type': 'string'},
|
||||
'startAt': {'type': 'string', 'format': 'date-time'},
|
||||
'endAt': {'type': 'string', 'format': 'date-time'},
|
||||
'timezone': {'type': 'string'},
|
||||
'location': {'type': 'string'},
|
||||
},
|
||||
'required': ['title', 'startAt'],
|
||||
},
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
@@ -270,7 +275,8 @@ class AgUiService {
|
||||
return '/api/v1/agent/history?${query.join('&')}';
|
||||
}
|
||||
|
||||
String _nextId(String prefix) => '$prefix${DateTime.now().millisecondsSinceEpoch}';
|
||||
String _nextId(String prefix) =>
|
||||
'$prefix${DateTime.now().millisecondsSinceEpoch}';
|
||||
|
||||
String _newUuid() {
|
||||
final random = Random();
|
||||
@@ -304,6 +310,15 @@ class AgUiService {
|
||||
'SSE',
|
||||
_handleMockSse,
|
||||
);
|
||||
client.registerHandler(
|
||||
'/api/v1/agent/transcribe',
|
||||
'POST',
|
||||
_handleMockTranscribe,
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, dynamic> _handleMockTranscribe(MockRequest request) {
|
||||
return {'transcript': '这是模拟语音转写'};
|
||||
}
|
||||
|
||||
Map<String, dynamic> _handleMockRun(MockRequest request) {
|
||||
@@ -331,9 +346,9 @@ class AgUiService {
|
||||
}
|
||||
|
||||
Map<String, dynamic> _handleMockResume(MockRequest request) {
|
||||
final match = RegExp(r'^/api/v1/agent/runs/([^/]+)/resume$').firstMatch(
|
||||
request.path,
|
||||
);
|
||||
final match = RegExp(
|
||||
r'^/api/v1/agent/runs/([^/]+)/resume$',
|
||||
).firstMatch(request.path);
|
||||
final threadId = match?.group(1) ?? (_threadId ?? _newUuid());
|
||||
final payload = request.data;
|
||||
final runInput = payload is Map<String, dynamic>
|
||||
@@ -344,7 +359,11 @@ class AgUiService {
|
||||
|
||||
final toolMessage = _extractLatestToolMessage(runInput);
|
||||
final events = <Map<String, dynamic>>[
|
||||
{'type': AgUiEventTypeWire.runStarted, 'threadId': threadId, 'runId': runId},
|
||||
{
|
||||
'type': AgUiEventTypeWire.runStarted,
|
||||
'threadId': threadId,
|
||||
'runId': runId,
|
||||
},
|
||||
{
|
||||
'type': AgUiEventTypeWire.toolCallResult,
|
||||
'messageId': _nextId(_messageIdPrefix),
|
||||
@@ -365,7 +384,11 @@ class AgUiService {
|
||||
'type': AgUiEventTypeWire.textMessageEnd,
|
||||
'messageId': _nextId(_messageIdPrefix),
|
||||
},
|
||||
{'type': AgUiEventTypeWire.runFinished, 'threadId': threadId, 'runId': runId},
|
||||
{
|
||||
'type': AgUiEventTypeWire.runFinished,
|
||||
'threadId': threadId,
|
||||
'runId': runId,
|
||||
},
|
||||
];
|
||||
_mockSseLinesByThread[threadId] = _toSseLines(events);
|
||||
return {
|
||||
@@ -398,7 +421,8 @@ class AgUiService {
|
||||
final messages = targetDate == null
|
||||
? <SnapshotMessage>[]
|
||||
: _historyService.getHistoryForDay(targetDate);
|
||||
final hasMore = targetDate != null && _historyService.hasEarlierHistory(targetDate);
|
||||
final hasMore =
|
||||
targetDate != null && _historyService.hasEarlierHistory(targetDate);
|
||||
_hasMoreHistory = hasMore;
|
||||
|
||||
return {
|
||||
@@ -421,9 +445,9 @@ class AgUiService {
|
||||
}
|
||||
|
||||
Stream<String> _handleMockSse(MockRequest request) {
|
||||
final match = RegExp(r'^/api/v1/agent/runs/([^/]+)/events$').firstMatch(
|
||||
request.path,
|
||||
);
|
||||
final match = RegExp(
|
||||
r'^/api/v1/agent/runs/([^/]+)/events$',
|
||||
).firstMatch(request.path);
|
||||
final threadId = match?.group(1);
|
||||
if (threadId == null) {
|
||||
return const Stream<String>.empty();
|
||||
@@ -441,7 +465,11 @@ class AgUiService {
|
||||
required String userInput,
|
||||
}) {
|
||||
final events = <Map<String, dynamic>>[
|
||||
{'type': AgUiEventTypeWire.runStarted, 'threadId': threadId, 'runId': runId},
|
||||
{
|
||||
'type': AgUiEventTypeWire.runStarted,
|
||||
'threadId': threadId,
|
||||
'runId': runId,
|
||||
},
|
||||
];
|
||||
|
||||
final forceTrigger = _decisionEngine.tryForceTrigger(userInput);
|
||||
@@ -451,19 +479,13 @@ class AgUiService {
|
||||
toolName = forceTrigger.toolName;
|
||||
args = forceTrigger.args;
|
||||
} else if (_looksLikeNavigationIntent(userInput)) {
|
||||
toolName = 'navigate_to_route';
|
||||
toolName = 'front.navigate_to_route';
|
||||
args = {'target': _inferNavigationRoute(userInput), 'replace': false};
|
||||
} else if (_decisionEngine.shouldTriggerToolCall(userInput)) {
|
||||
toolName = 'create_calendar_event';
|
||||
args = _decisionEngine.getToolCallArgs(userInput);
|
||||
}
|
||||
|
||||
if (toolName != null && args != null) {
|
||||
if (toolName == 'navigate_to_route') {
|
||||
args = {
|
||||
...args,
|
||||
'__nonce': _nextId('nonce_'),
|
||||
};
|
||||
if (toolName == 'front.navigate_to_route') {
|
||||
args = {...args, '__nonce': _nextId('nonce_')};
|
||||
}
|
||||
final toolCallId = _nextId(_toolCallIdPrefix);
|
||||
events.add({
|
||||
@@ -476,32 +498,20 @@ class AgUiService {
|
||||
'toolCallId': toolCallId,
|
||||
'delta': jsonEncode(args),
|
||||
});
|
||||
events.add({'type': AgUiEventTypeWire.toolCallEnd, 'toolCallId': toolCallId});
|
||||
events.add({
|
||||
'type': AgUiEventTypeWire.toolCallEnd,
|
||||
'toolCallId': toolCallId,
|
||||
});
|
||||
|
||||
if (toolName == 'navigate_to_route') {
|
||||
if (toolName == 'front.navigate_to_route') {
|
||||
// 前端工具:等待审批后由 resume 返回 TOOL_CALL_RESULT。
|
||||
} else {
|
||||
final validation = ToolRegistry.validateArgs(toolName, args);
|
||||
if (!validation.ok) {
|
||||
events.add({
|
||||
'type': AgUiEventTypeWire.toolCallError,
|
||||
'toolCallId': toolCallId,
|
||||
'error': validation.error ?? 'Validation failed',
|
||||
'code': 'VALIDATION_ERROR',
|
||||
});
|
||||
} else {
|
||||
final result = _mockCalendarResult(args);
|
||||
final ui = _buildUiCard(toolName, result);
|
||||
events.add({
|
||||
'type': AgUiEventTypeWire.toolCallResult,
|
||||
'messageId': _nextId(_messageIdPrefix),
|
||||
'toolCallId': toolCallId,
|
||||
'content': jsonEncode({
|
||||
'result': result,
|
||||
if (ui != null) 'ui': ui.toJson(),
|
||||
}),
|
||||
});
|
||||
}
|
||||
events.add({
|
||||
'type': AgUiEventTypeWire.toolCallError,
|
||||
'toolCallId': toolCallId,
|
||||
'error': 'Unsupported frontend tool in mock mode',
|
||||
'code': 'UNSUPPORTED_TOOL',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -518,7 +528,10 @@ class AgUiService {
|
||||
'messageId': messageId,
|
||||
'delta': reply,
|
||||
});
|
||||
events.add({'type': AgUiEventTypeWire.textMessageEnd, 'messageId': messageId});
|
||||
events.add({
|
||||
'type': AgUiEventTypeWire.textMessageEnd,
|
||||
'messageId': messageId,
|
||||
});
|
||||
}
|
||||
|
||||
events.add({
|
||||
@@ -577,57 +590,14 @@ class AgUiService {
|
||||
if (raw['role'] != 'tool') {
|
||||
continue;
|
||||
}
|
||||
final toolCallId = raw['toolCallId'] as String? ?? _nextId(_toolCallIdPrefix);
|
||||
final toolCallId =
|
||||
raw['toolCallId'] as String? ?? _nextId(_toolCallIdPrefix);
|
||||
final content = raw['content'] as String? ?? '{}';
|
||||
return (toolCallId, content);
|
||||
}
|
||||
return (_nextId(_toolCallIdPrefix), '{}');
|
||||
}
|
||||
|
||||
Map<String, dynamic> _mockCalendarResult(Map<String, dynamic> args) {
|
||||
final eventId = 'evt_${DateTime.now().millisecondsSinceEpoch}';
|
||||
return {
|
||||
'eventId': eventId,
|
||||
'ok': true,
|
||||
'message': '日程已创建',
|
||||
'title': args['title'],
|
||||
'description': args['description'],
|
||||
'startAt': args['startAt'],
|
||||
'endAt': args['endAt'],
|
||||
'timezone': args['timezone'] ?? 'Asia/Shanghai',
|
||||
'location': args['location'],
|
||||
'color': '#4F46E5',
|
||||
'sourceType': 'agentGenerated',
|
||||
};
|
||||
}
|
||||
|
||||
UiCard? _buildUiCard(String toolName, Map<String, dynamic> result) {
|
||||
if (toolName != 'create_calendar_event') {
|
||||
return null;
|
||||
}
|
||||
return UiCard(
|
||||
cardType: 'calendar_card.v1',
|
||||
data: CalendarCardData(
|
||||
id: result['eventId'] ?? '',
|
||||
title: result['title'] ?? '',
|
||||
description: result['description'],
|
||||
startAt: result['startAt'] ?? '',
|
||||
endAt: result['endAt'],
|
||||
timezone: result['timezone'],
|
||||
location: result['location'],
|
||||
color: result['color'],
|
||||
sourceType: result['sourceType'],
|
||||
).toJson(),
|
||||
actions: [
|
||||
CardAction(
|
||||
type: 'link',
|
||||
label: '查看详情',
|
||||
target: '/calendar/events/${result['eventId']}',
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
List<String> _generateReplies(String content) {
|
||||
final intent = _decisionEngine.matchIntent(content);
|
||||
switch (intent) {
|
||||
|
||||
@@ -4,13 +4,7 @@ typedef ToolHandler =
|
||||
Future<Map<String, dynamic>> Function(Map<String, dynamic> args);
|
||||
|
||||
/// 工具常量
|
||||
const _toolNameCreateCalendar = 'create_calendar_event';
|
||||
const _toolNameNavigateRoute = 'navigate_to_route';
|
||||
const _defaultTimezone = 'Asia/Shanghai';
|
||||
const _defaultEventColor = '#4F46E5';
|
||||
const _defaultSourceType = 'agentGenerated';
|
||||
const _titleMinLength = 1;
|
||||
const _titleMaxLength = 100;
|
||||
const _toolNameNavigateRoute = 'front.navigate_to_route';
|
||||
|
||||
class ToolDefinition {
|
||||
final String name;
|
||||
@@ -33,38 +27,6 @@ class ToolRegistry {
|
||||
static void initialize() {
|
||||
if (_initialized) return;
|
||||
|
||||
_tools[_toolNameCreateCalendar] = ToolDefinition(
|
||||
name: _toolNameCreateCalendar,
|
||||
description: '创建一个日历事件或待办事项',
|
||||
parameters: {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'title': {
|
||||
'type': 'string',
|
||||
'description': '事件标题',
|
||||
'minLength': _titleMinLength,
|
||||
'maxLength': _titleMaxLength,
|
||||
},
|
||||
'description': {'type': 'string', 'description': '事件描述'},
|
||||
'startAt': {
|
||||
'type': 'string',
|
||||
'format': 'date-time',
|
||||
'description': '开始时间 (ISO8601)',
|
||||
},
|
||||
'endAt': {
|
||||
'type': 'string',
|
||||
'format': 'date-time',
|
||||
'description': '结束时间 (ISO8601)',
|
||||
},
|
||||
'timezone': {'type': 'string', 'default': _defaultTimezone},
|
||||
'location': {'type': 'string'},
|
||||
'notes': {'type': 'string'},
|
||||
},
|
||||
'required': ['title', 'startAt'],
|
||||
},
|
||||
handler: _handleCreateCalendarEvent,
|
||||
);
|
||||
|
||||
_tools[_toolNameNavigateRoute] = ToolDefinition(
|
||||
name: _toolNameNavigateRoute,
|
||||
description: '在前端执行路由跳转',
|
||||
@@ -82,25 +44,6 @@ class ToolRegistry {
|
||||
_initialized = true;
|
||||
}
|
||||
|
||||
static Future<Map<String, dynamic>> _handleCreateCalendarEvent(
|
||||
Map<String, dynamic> args,
|
||||
) async {
|
||||
final eventId = 'evt_${DateTime.now().millisecondsSinceEpoch}';
|
||||
return {
|
||||
'eventId': eventId,
|
||||
'ok': true,
|
||||
'message': '日程已创建',
|
||||
'title': args['title'],
|
||||
'description': args['description'],
|
||||
'startAt': args['startAt'],
|
||||
'endAt': args['endAt'],
|
||||
'timezone': args['timezone'] ?? _defaultTimezone,
|
||||
'location': args['location'],
|
||||
'color': _defaultEventColor,
|
||||
'sourceType': _defaultSourceType,
|
||||
};
|
||||
}
|
||||
|
||||
static Future<Map<String, dynamic>> _handleNavigateRoute(
|
||||
Map<String, dynamic> args,
|
||||
) async {
|
||||
|
||||
@@ -2,11 +2,11 @@ import 'dart:convert';
|
||||
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:social_app/core/api/i_api_client.dart';
|
||||
import 'package:social_app/core/api/mock_api_client.dart';
|
||||
import 'package:social_app/core/di/injection.dart';
|
||||
|
||||
import '../../data/models/ag_ui_event.dart';
|
||||
import '../../data/models/chat_list_item.dart';
|
||||
import '../../data/models/tool_result.dart';
|
||||
import '../../data/services/ag_ui_service.dart';
|
||||
|
||||
class ChatState {
|
||||
@@ -57,7 +57,14 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
|
||||
ChatBloc({AgUiService? service, IApiClient? apiClient})
|
||||
: _service =
|
||||
service ?? AgUiService(apiClient: apiClient ?? sl<IApiClient>()),
|
||||
service ??
|
||||
AgUiService(
|
||||
apiClient:
|
||||
apiClient ??
|
||||
(sl.isRegistered<IApiClient>()
|
||||
? sl<IApiClient>()
|
||||
: MockApiClient()),
|
||||
),
|
||||
super(const ChatState()) {
|
||||
_service.onEvent = _handleEvent;
|
||||
}
|
||||
@@ -162,13 +169,10 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
_toolCallArgsBuffer.remove(endEvent.toolCallId);
|
||||
final updatedItems = state.items.map((item) {
|
||||
if (item.id == endEvent.toolCallId && item is ToolCallItem) {
|
||||
final nextStatus = item.toolName == 'navigate_to_route'
|
||||
final nextStatus = item.toolName == 'front.navigate_to_route'
|
||||
? ToolCallStatus.pending
|
||||
: ToolCallStatus.executing;
|
||||
return item.copyWith(
|
||||
args: parsedArgs,
|
||||
status: nextStatus,
|
||||
);
|
||||
return item.copyWith(args: parsedArgs, status: nextStatus);
|
||||
}
|
||||
return item;
|
||||
}).toList();
|
||||
@@ -344,7 +348,10 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
}
|
||||
final updatedItems = state.items.map((item) {
|
||||
if (item is ToolCallItem && item.callId == toolCallId) {
|
||||
return item.copyWith(status: ToolCallStatus.executing, errorMessage: null);
|
||||
return item.copyWith(
|
||||
status: ToolCallStatus.executing,
|
||||
errorMessage: null,
|
||||
);
|
||||
}
|
||||
return item;
|
||||
}).toList();
|
||||
@@ -365,10 +372,20 @@ class ChatBloc extends Cubit<ChatState> {
|
||||
}
|
||||
return item;
|
||||
}).toList();
|
||||
emit(state.copyWith(items: failedItems, isLoading: false, error: error.toString()));
|
||||
emit(
|
||||
state.copyWith(
|
||||
items: failedItems,
|
||||
isLoading: false,
|
||||
error: error.toString(),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<String> transcribeAudioFile(String filePath) {
|
||||
return _service.transcribeAudio(filePath);
|
||||
}
|
||||
|
||||
void clearError() {
|
||||
emit(state.copyWith(error: null));
|
||||
}
|
||||
|
||||
@@ -4,14 +4,19 @@ import '../../data/models/tool_result.dart';
|
||||
|
||||
/// 卡片类型常量
|
||||
const _calendarCardType = 'calendar_card.v1';
|
||||
const _calendarListType = 'calendar_event_list.v1';
|
||||
const _calendarOperationType = 'calendar_operation.v1';
|
||||
const _errorCardType = 'error_card.v1';
|
||||
const _aiGeneratedSource = 'ai_generated';
|
||||
const _agentGeneratedSource = 'agent_generated';
|
||||
const _primaryActionType = 'primary';
|
||||
|
||||
class UiSchemaRenderer {
|
||||
static Widget render(UiCard card) {
|
||||
return switch (card.cardType) {
|
||||
_calendarCardType => _renderCalendarCard(card),
|
||||
_calendarListType => _renderCalendarList(card),
|
||||
_calendarOperationType => _renderCalendarOperation(card),
|
||||
_errorCardType => _renderErrorCard(card),
|
||||
_ => _renderUnknownCard(card),
|
||||
};
|
||||
@@ -22,7 +27,9 @@ class UiSchemaRenderer {
|
||||
final color = data.color != null
|
||||
? Color(int.parse(data.color!.replaceFirst('#', '0xFF')))
|
||||
: AppColors.blue500;
|
||||
final isAiGenerated = data.sourceType == _aiGeneratedSource;
|
||||
final isAiGenerated =
|
||||
data.sourceType == _aiGeneratedSource ||
|
||||
data.sourceType == _agentGeneratedSource;
|
||||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
@@ -152,6 +159,103 @@ class UiSchemaRenderer {
|
||||
);
|
||||
}
|
||||
|
||||
static Widget _renderCalendarList(UiCard card) {
|
||||
final rawItems = card.data['items'];
|
||||
final items = rawItems is List ? rawItems : const [];
|
||||
final paginationRaw = card.data['pagination'];
|
||||
final pagination = paginationRaw is Map<String, dynamic>
|
||||
? paginationRaw
|
||||
: const <String, dynamic>{};
|
||||
final page = pagination['page'];
|
||||
final total = pagination['total'];
|
||||
|
||||
return Container(
|
||||
padding: EdgeInsets.all(AppSpacing.lg),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.messageCardBg,
|
||||
borderRadius: BorderRadius.circular(AppRadius.lg),
|
||||
border: Border.all(color: AppColors.messageCardBorder),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'日程列表',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.slate900,
|
||||
),
|
||||
),
|
||||
if (page != null || total != null) ...[
|
||||
SizedBox(height: AppSpacing.xs),
|
||||
Text(
|
||||
'第${page ?? '-'}页 · 共${total ?? '-'}条',
|
||||
style: TextStyle(fontSize: 12, color: AppColors.slate500),
|
||||
),
|
||||
],
|
||||
SizedBox(height: AppSpacing.sm),
|
||||
if (items.isEmpty)
|
||||
Text(
|
||||
'暂无日程',
|
||||
style: TextStyle(fontSize: 14, color: AppColors.slate500),
|
||||
),
|
||||
for (final item in items)
|
||||
if (item is Map<String, dynamic>)
|
||||
Padding(
|
||||
padding: EdgeInsets.only(bottom: AppSpacing.xs),
|
||||
child: Text(
|
||||
item['title']?.toString() ?? '未命名日程',
|
||||
style: TextStyle(fontSize: 14, color: AppColors.slate700),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static Widget _renderCalendarOperation(UiCard card) {
|
||||
final ok = card.data['ok'] == true;
|
||||
final operation = card.data['operation']?.toString() ?? 'operation';
|
||||
final message = card.data['message']?.toString() ?? (ok ? '操作成功' : '操作失败');
|
||||
|
||||
return Container(
|
||||
padding: EdgeInsets.all(AppSpacing.lg),
|
||||
decoration: BoxDecoration(
|
||||
color: ok ? AppColors.messageCardBg : AppColors.warningBackground,
|
||||
borderRadius: BorderRadius.circular(AppRadius.lg),
|
||||
border: Border.all(
|
||||
color: ok ? AppColors.messageCardBorder : AppColors.red400,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'日程$operation结果',
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: ok ? AppColors.slate900 : AppColors.red600,
|
||||
),
|
||||
),
|
||||
SizedBox(height: AppSpacing.xs),
|
||||
Text(
|
||||
message,
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
color: ok ? AppColors.slate600 : AppColors.red600,
|
||||
),
|
||||
),
|
||||
if (card.actions != null && card.actions!.isNotEmpty) ...[
|
||||
SizedBox(height: AppSpacing.md),
|
||||
_buildActions(card.actions!),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static Widget _renderErrorCard(UiCard card) {
|
||||
final message = card.data['message'] as String? ?? '发生错误';
|
||||
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:record/record.dart';
|
||||
|
||||
abstract class VoiceRecorder {
|
||||
Future<void> start();
|
||||
Future<String?> stop();
|
||||
Future<void> dispose();
|
||||
}
|
||||
|
||||
class RecordVoiceRecorder implements VoiceRecorder {
|
||||
final AudioRecorder _recorder;
|
||||
String? _currentPath;
|
||||
|
||||
RecordVoiceRecorder({AudioRecorder? recorder})
|
||||
: _recorder = recorder ?? AudioRecorder();
|
||||
|
||||
@override
|
||||
Future<void> start() async {
|
||||
bool hasPermission;
|
||||
try {
|
||||
hasPermission = await _recorder.hasPermission();
|
||||
} on MissingPluginException catch (_) {
|
||||
throw StateError('录音组件未加载,请完全重启 App 后重试');
|
||||
}
|
||||
if (!hasPermission) {
|
||||
throw StateError('录音权限未授权');
|
||||
}
|
||||
|
||||
final fileName =
|
||||
'voice_${DateTime.now().millisecondsSinceEpoch}_${DateTime.now().microsecond}.wav';
|
||||
final path = '${Directory.systemTemp.path}/$fileName';
|
||||
_currentPath = path;
|
||||
try {
|
||||
await _recorder.start(
|
||||
const RecordConfig(
|
||||
encoder: AudioEncoder.wav,
|
||||
sampleRate: 16000,
|
||||
numChannels: 1,
|
||||
),
|
||||
path: path,
|
||||
);
|
||||
} on MissingPluginException catch (_) {
|
||||
throw StateError('录音组件未加载,请完全重启 App 后重试');
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<String?> stop() async {
|
||||
String? stoppedPath;
|
||||
try {
|
||||
stoppedPath = await _recorder.stop();
|
||||
} on MissingPluginException catch (_) {
|
||||
throw StateError('录音组件未加载,请完全重启 App 后重试');
|
||||
}
|
||||
return stoppedPath ?? _currentPath;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> dispose() async {
|
||||
await _recorder.dispose();
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,15 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:lucide_icons/lucide_icons.dart';
|
||||
import '../../../../core/api/api_exception.dart';
|
||||
import '../../../../core/theme/design_tokens.dart';
|
||||
import '../../../chat/data/models/chat_list_item.dart';
|
||||
import '../../../chat/presentation/bloc/chat_bloc.dart';
|
||||
import '../../../chat/data/tools/route_navigation_tool.dart';
|
||||
import '../../data/voice_recorder.dart';
|
||||
import '../../../chat/ui/widgets/ui_schema_renderer.dart';
|
||||
import '../../../../shared/widgets/toast/toast.dart';
|
||||
import '../../../../shared/widgets/toast/toast_type.dart';
|
||||
@@ -23,22 +27,42 @@ const _cornerRadius = 12.0;
|
||||
const _inputMinHeight = 48.0;
|
||||
const _inputRadius = 24.0;
|
||||
const _scrollDurationMs = 300;
|
||||
const _rippleDurationMs = 1200;
|
||||
const _recordingDotSize = 10.0;
|
||||
|
||||
/// 颜色常量
|
||||
const _chatBgColor = Color(0xFFF8FAFC);
|
||||
const _userBubbleColor = Color(0xFFEAF1FB);
|
||||
|
||||
class HomeScreen extends StatefulWidget {
|
||||
const HomeScreen({super.key});
|
||||
final VoiceRecorder? voiceRecorder;
|
||||
final Future<String> Function(String filePath)? onTranscribeAudio;
|
||||
final Future<void> Function(String transcript)? onAutoSendTranscript;
|
||||
final bool autoLoadHistory;
|
||||
|
||||
const HomeScreen({
|
||||
super.key,
|
||||
this.voiceRecorder,
|
||||
this.onTranscribeAudio,
|
||||
this.onAutoSendTranscript,
|
||||
this.autoLoadHistory = true,
|
||||
});
|
||||
|
||||
@override
|
||||
State<HomeScreen> createState() => _HomeScreenState();
|
||||
}
|
||||
|
||||
class _HomeScreenState extends State<HomeScreen> {
|
||||
class _HomeScreenState extends State<HomeScreen>
|
||||
with SingleTickerProviderStateMixin {
|
||||
final TextEditingController _messageController = TextEditingController();
|
||||
final ScrollController _scrollController = ScrollController();
|
||||
late final ChatBloc _chatBloc;
|
||||
late final VoiceRecorder _voiceRecorder;
|
||||
late final Future<String> Function(String filePath) _transcribeAudio;
|
||||
late final Future<void> Function(String transcript) _autoSendTranscript;
|
||||
late final AnimationController _listeningAnimationController;
|
||||
bool _isRecording = false;
|
||||
bool _isTranscribing = false;
|
||||
|
||||
bool get _hasMessage => _messageController.text.trim().isNotEmpty;
|
||||
|
||||
@@ -47,7 +71,17 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
super.initState();
|
||||
_messageController.addListener(_onMessageChanged);
|
||||
_chatBloc = ChatBloc();
|
||||
_chatBloc.loadHistory();
|
||||
_voiceRecorder = widget.voiceRecorder ?? RecordVoiceRecorder();
|
||||
_transcribeAudio =
|
||||
widget.onTranscribeAudio ?? _chatBloc.transcribeAudioFile;
|
||||
_autoSendTranscript = widget.onAutoSendTranscript ?? _chatBloc.sendMessage;
|
||||
_listeningAnimationController = AnimationController(
|
||||
vsync: this,
|
||||
duration: const Duration(milliseconds: _rippleDurationMs),
|
||||
);
|
||||
if (widget.autoLoadHistory) {
|
||||
_chatBloc.loadHistory();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -55,6 +89,8 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
_messageController.removeListener(_onMessageChanged);
|
||||
_messageController.dispose();
|
||||
_scrollController.dispose();
|
||||
_listeningAnimationController.dispose();
|
||||
_voiceRecorder.dispose();
|
||||
_chatBloc.close();
|
||||
RouteNavigationTool.instance.clearNavigator();
|
||||
super.dispose();
|
||||
@@ -341,7 +377,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(statusText, style: TextStyle(fontSize: 12, color: statusColor)),
|
||||
if (item.toolName == 'navigate_to_route' &&
|
||||
if (item.toolName == 'front.navigate_to_route' &&
|
||||
item.status == ToolCallStatus.pending) ...[
|
||||
const SizedBox(width: 8),
|
||||
GestureDetector(
|
||||
@@ -376,7 +412,9 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () => _showBottomSheet(context),
|
||||
onTap: _isRecording
|
||||
? _stopRecording
|
||||
: () => _showBottomSheet(context),
|
||||
child: Container(
|
||||
width: 36,
|
||||
height: 36,
|
||||
@@ -385,10 +423,10 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(color: AppColors.slate300),
|
||||
),
|
||||
child: const Icon(
|
||||
LucideIcons.plus,
|
||||
child: Icon(
|
||||
_isRecording ? LucideIcons.square : LucideIcons.plus,
|
||||
size: 20,
|
||||
color: AppColors.slate500,
|
||||
color: _isRecording ? AppColors.red600 : AppColors.slate500,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -406,32 +444,42 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextField(
|
||||
controller: _messageController,
|
||||
minLines: 1,
|
||||
maxLines: 3,
|
||||
decoration: const InputDecoration(
|
||||
hintText: '输入消息...',
|
||||
border: InputBorder.none,
|
||||
enabledBorder: InputBorder.none,
|
||||
focusedBorder: InputBorder.none,
|
||||
disabledBorder: InputBorder.none,
|
||||
errorBorder: InputBorder.none,
|
||||
focusedErrorBorder: InputBorder.none,
|
||||
isDense: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
filled: false,
|
||||
),
|
||||
onSubmitted: (_) => _sendMessage(context),
|
||||
),
|
||||
child: _isRecording
|
||||
? _buildListeningIndicator()
|
||||
: TextField(
|
||||
controller: _messageController,
|
||||
minLines: 1,
|
||||
maxLines: 3,
|
||||
decoration: const InputDecoration(
|
||||
hintText: '输入消息...',
|
||||
border: InputBorder.none,
|
||||
enabledBorder: InputBorder.none,
|
||||
focusedBorder: InputBorder.none,
|
||||
disabledBorder: InputBorder.none,
|
||||
errorBorder: InputBorder.none,
|
||||
focusedErrorBorder: InputBorder.none,
|
||||
isDense: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
filled: false,
|
||||
),
|
||||
onSubmitted: (_) => _sendMessage(context),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
GestureDetector(
|
||||
onTap: _hasMessage ? () => _sendMessage(context) : null,
|
||||
onTap: _isTranscribing
|
||||
? null
|
||||
: _isRecording
|
||||
? () => _stopRecording(autoSendAfterTranscribe: true)
|
||||
: _hasMessage
|
||||
? () => _sendMessage(context)
|
||||
: _startRecording,
|
||||
child: Icon(
|
||||
_hasMessage ? LucideIcons.send : LucideIcons.mic,
|
||||
_isRecording || _hasMessage
|
||||
? LucideIcons.send
|
||||
: LucideIcons.mic,
|
||||
size: _iconSize,
|
||||
color: _hasMessage
|
||||
color: _isRecording || _hasMessage
|
||||
? AppColors.blue600
|
||||
: AppColors.slate500,
|
||||
),
|
||||
@@ -462,6 +510,134 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
});
|
||||
}
|
||||
|
||||
Widget _buildListeningIndicator() {
|
||||
return SizedBox(
|
||||
height: _inputMinHeight,
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
AnimatedBuilder(
|
||||
animation: _listeningAnimationController,
|
||||
builder: (context, _) {
|
||||
final t = _listeningAnimationController.value;
|
||||
final waveA =
|
||||
0.4 + 0.6 * (1 - ((t - 0.2).abs() * 2).clamp(0.0, 1.0));
|
||||
final waveB =
|
||||
0.4 + 0.6 * (1 - ((t - 0.5).abs() * 2).clamp(0.0, 1.0));
|
||||
final waveC =
|
||||
0.4 + 0.6 * (1 - ((t - 0.8).abs() * 2).clamp(0.0, 1.0));
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
_buildWaveDot(scale: waveA),
|
||||
const SizedBox(width: 6),
|
||||
_buildWaveDot(scale: waveB),
|
||||
const SizedBox(width: 6),
|
||||
_buildWaveDot(scale: waveC),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
const Text(
|
||||
'正在聆听...',
|
||||
style: TextStyle(fontSize: 14, color: AppColors.slate500),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildWaveDot({required double scale}) {
|
||||
return Transform.scale(
|
||||
scale: scale,
|
||||
child: Container(
|
||||
width: _recordingDotSize,
|
||||
height: _recordingDotSize,
|
||||
decoration: const BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: AppColors.red600,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _startRecording() async {
|
||||
try {
|
||||
await _voiceRecorder.start();
|
||||
_listeningAnimationController.repeat();
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_isRecording = true;
|
||||
});
|
||||
} catch (error) {
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
Toast.show(context, _readableError(error), type: ToastType.error);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _stopRecording({bool autoSendAfterTranscribe = false}) async {
|
||||
String? audioPath;
|
||||
try {
|
||||
audioPath = await _voiceRecorder.stop();
|
||||
_listeningAnimationController.stop();
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_isRecording = false;
|
||||
_isTranscribing = true;
|
||||
});
|
||||
if (audioPath == null || audioPath.isEmpty) {
|
||||
throw StateError('录音失败,请重试');
|
||||
}
|
||||
final transcript = await _transcribeAudio(audioPath);
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
_messageController.text = transcript;
|
||||
_messageController.selection = TextSelection.fromPosition(
|
||||
TextPosition(offset: transcript.length),
|
||||
);
|
||||
if (autoSendAfterTranscribe && transcript.trim().isNotEmpty) {
|
||||
_messageController.clear();
|
||||
await _autoSendTranscript(transcript.trim());
|
||||
}
|
||||
} catch (error) {
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
Toast.show(context, _readableError(error), type: ToastType.error);
|
||||
} finally {
|
||||
if (audioPath != null) {
|
||||
final file = File(audioPath);
|
||||
if (await file.exists()) {
|
||||
await file.delete();
|
||||
}
|
||||
}
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isTranscribing = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String _readableError(Object error) {
|
||||
if (error is ApiException) {
|
||||
return error.message;
|
||||
}
|
||||
final raw = error.toString();
|
||||
if (raw.startsWith('Instance of')) {
|
||||
return '请求失败,请稍后重试';
|
||||
}
|
||||
return raw.replaceFirst('Bad state: ', '');
|
||||
}
|
||||
|
||||
void _showBottomSheet(BuildContext context) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
|
||||
@@ -21,6 +21,7 @@ dependencies:
|
||||
intl: ^0.19.0
|
||||
shared_preferences: ^2.2.2
|
||||
json_annotation: ^4.8.1
|
||||
record: ^6.1.1
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
@@ -194,7 +194,7 @@ void main() {
|
||||
final json = {
|
||||
'type': 'TOOL_CALL_START',
|
||||
'toolCallId': 'tc_123',
|
||||
'toolCallName': 'create_calendar_event',
|
||||
'toolCallName': 'back.mutate_calendar_event',
|
||||
'parentMessageId': 'msg_001',
|
||||
};
|
||||
|
||||
@@ -203,7 +203,7 @@ void main() {
|
||||
expect(event, isA<ToolCallStartEvent>());
|
||||
final toolStart = event as ToolCallStartEvent;
|
||||
expect(toolStart.toolCallId, 'tc_123');
|
||||
expect(toolStart.toolCallName, 'create_calendar_event');
|
||||
expect(toolStart.toolCallName, 'back.mutate_calendar_event');
|
||||
expect(toolStart.parentMessageId, 'msg_001');
|
||||
});
|
||||
|
||||
@@ -265,6 +265,37 @@ void main() {
|
||||
expect(toolResult.result['eventId'], 'evt_001');
|
||||
});
|
||||
|
||||
test('ToolCallResultEvent.ui parses from payload.ui', () {
|
||||
final json = {
|
||||
'type': 'TOOL_CALL_RESULT',
|
||||
'messageId': 'msg_123',
|
||||
'toolCallId': 'tc_123',
|
||||
'content':
|
||||
'{"ui":{"type":"calendar_card.v1","version":"v1","data":{"id":"evt_1","title":"会议","startAt":"2026-03-01T10:00:00Z"},"actions":[]}}',
|
||||
};
|
||||
|
||||
final event = AgUiEvent.fromJson(json) as ToolCallResultEvent;
|
||||
expect(event.ui, isNotNull);
|
||||
expect(event.ui!.cardType, 'calendar_card.v1');
|
||||
});
|
||||
|
||||
test(
|
||||
'ToolCallResultEvent.ui parses from payload.result when result is UiCard',
|
||||
() {
|
||||
final json = {
|
||||
'type': 'TOOL_CALL_RESULT',
|
||||
'messageId': 'msg_123',
|
||||
'toolCallId': 'tc_123',
|
||||
'content':
|
||||
'{"result":{"type":"calendar_operation.v1","version":"v1","data":{"operation":"delete","ok":true},"actions":[]}}',
|
||||
};
|
||||
|
||||
final event = AgUiEvent.fromJson(json) as ToolCallResultEvent;
|
||||
expect(event.ui, isNotNull);
|
||||
expect(event.ui!.cardType, 'calendar_operation.v1');
|
||||
},
|
||||
);
|
||||
|
||||
test('parses ToolCallErrorEvent', () {
|
||||
final json = {
|
||||
'type': 'TOOL_CALL_ERROR',
|
||||
|
||||
@@ -26,8 +26,6 @@ class TestableAgUiService extends AgUiService {
|
||||
final forceTrigger = engine.tryForceTrigger(content);
|
||||
if (forceTrigger != null) {
|
||||
await mockToolCallFlowWithArgs(forceTrigger.toolName, forceTrigger.args);
|
||||
} else if (engine.shouldTriggerToolCall(content)) {
|
||||
await mockToolCallFlow(content, engine);
|
||||
}
|
||||
|
||||
final replies = generateReplies(content, engine);
|
||||
@@ -38,13 +36,6 @@ class TestableAgUiService extends AgUiService {
|
||||
onEvent(RunFinishedEvent(threadId: threadId, runId: runId));
|
||||
}
|
||||
|
||||
Future<void> mockToolCallFlow(String content, AiDecisionEngine engine) async {
|
||||
final args = engine.getToolCallArgs(content);
|
||||
if (args == null) return;
|
||||
|
||||
await mockToolCallFlowWithArgs('create_calendar_event', args);
|
||||
}
|
||||
|
||||
Future<void> mockToolCallFlowWithArgs(
|
||||
String toolName,
|
||||
Map<String, dynamic> args,
|
||||
@@ -57,6 +48,10 @@ class TestableAgUiService extends AgUiService {
|
||||
|
||||
onEvent(ToolCallEndEvent(toolCallId: toolCallId));
|
||||
|
||||
if (toolName == 'front.navigate_to_route') {
|
||||
return;
|
||||
}
|
||||
|
||||
final validation = ToolRegistry.validateArgs(toolName, args);
|
||||
if (!validation.ok) {
|
||||
onEvent(
|
||||
@@ -71,7 +66,7 @@ class TestableAgUiService extends AgUiService {
|
||||
|
||||
try {
|
||||
ToolRegistry.initialize();
|
||||
final result = await ToolRegistry.execute(toolName, args);
|
||||
await ToolRegistry.execute(toolName, args);
|
||||
final messageId = 'msg_${DateTime.now().millisecondsSinceEpoch}';
|
||||
|
||||
onEvent(
|
||||
@@ -157,28 +152,30 @@ void main() {
|
||||
expect(types.last, AgUiEventType.runFinished);
|
||||
});
|
||||
|
||||
test('creating schedule text triggers tool call events', () async {
|
||||
await service.sendMessage('提醒我明天10点开会');
|
||||
test(
|
||||
'creating schedule text does not trigger frontend tool call events',
|
||||
() async {
|
||||
await service.sendMessage('提醒我明天10点开会');
|
||||
|
||||
final toolCallStarts = capturedEvents
|
||||
.whereType<ToolCallStartEvent>()
|
||||
.toList();
|
||||
final toolCallEnds = capturedEvents
|
||||
.whereType<ToolCallEndEvent>()
|
||||
.toList();
|
||||
final toolCallResults = capturedEvents
|
||||
.whereType<ToolCallResultEvent>()
|
||||
.toList();
|
||||
final toolCallStarts = capturedEvents
|
||||
.whereType<ToolCallStartEvent>()
|
||||
.toList();
|
||||
final toolCallEnds = capturedEvents
|
||||
.whereType<ToolCallEndEvent>()
|
||||
.toList();
|
||||
final toolCallResults = capturedEvents
|
||||
.whereType<ToolCallResultEvent>()
|
||||
.toList();
|
||||
|
||||
expect(toolCallStarts.isNotEmpty, true);
|
||||
expect(toolCallEnds.isNotEmpty, true);
|
||||
expect(toolCallResults.isNotEmpty, true);
|
||||
expect(toolCallStarts.first.toolCallName, 'create_calendar_event');
|
||||
});
|
||||
expect(toolCallStarts.isEmpty, true);
|
||||
expect(toolCallEnds.isEmpty, true);
|
||||
expect(toolCallResults.isEmpty, true);
|
||||
},
|
||||
);
|
||||
|
||||
test('force trigger with #tool syntax', () async {
|
||||
await service.sendMessage(
|
||||
'#tool:create_calendar_event {"title": "Test", "startAt": "2026-03-01T10:00:00Z"}',
|
||||
'#tool:front.navigate_to_route {"target": "/calendar/dayweek"}',
|
||||
);
|
||||
|
||||
final toolCallStarts = capturedEvents
|
||||
@@ -186,7 +183,7 @@ void main() {
|
||||
.toList();
|
||||
|
||||
expect(toolCallStarts.isNotEmpty, true);
|
||||
expect(toolCallStarts.first.toolCallName, 'create_calendar_event');
|
||||
expect(toolCallStarts.first.toolCallName, 'front.navigate_to_route');
|
||||
});
|
||||
|
||||
test('text message events are emitted for unknown intent', () async {
|
||||
@@ -215,15 +212,18 @@ void main() {
|
||||
expect(toolCallStarts.isEmpty, true);
|
||||
});
|
||||
|
||||
test('tool call with invalid args emits error', () async {
|
||||
await service.sendMessage('#tool:create_calendar_event {}');
|
||||
test('frontend tool call keeps pending state before approval', () async {
|
||||
await service.sendMessage('#tool:front.navigate_to_route {}');
|
||||
|
||||
final toolCallErrors = capturedEvents
|
||||
.whereType<ToolCallErrorEvent>()
|
||||
.toList();
|
||||
final toolCallStarts = capturedEvents
|
||||
.whereType<ToolCallStartEvent>()
|
||||
.toList();
|
||||
|
||||
expect(toolCallErrors.isNotEmpty, true);
|
||||
expect(toolCallErrors.first.error, contains('Missing required fields'));
|
||||
expect(toolCallStarts.isNotEmpty, true);
|
||||
expect(toolCallErrors.isEmpty, true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -319,7 +319,7 @@ void main() {
|
||||
await service.sendMessage('初始化会话');
|
||||
await service.approveToolCall(
|
||||
toolCallId: 'call-1',
|
||||
toolName: 'navigate_to_route',
|
||||
toolName: 'front.navigate_to_route',
|
||||
args: {
|
||||
'target': '/calendar/dayweek',
|
||||
'replace': false,
|
||||
@@ -349,7 +349,7 @@ void main() {
|
||||
(e) => e.toolCallId == toolStart.toolCallId,
|
||||
);
|
||||
final toolArgs = jsonDecode(toolArgsEvent.delta) as Map<String, dynamic>;
|
||||
expect(toolStart.toolCallName, 'navigate_to_route');
|
||||
expect(toolStart.toolCallName, 'front.navigate_to_route');
|
||||
expect(
|
||||
events
|
||||
.whereType<ToolCallResultEvent>()
|
||||
@@ -360,7 +360,7 @@ void main() {
|
||||
|
||||
await realService.approveToolCall(
|
||||
toolCallId: toolStart.toolCallId,
|
||||
toolName: 'navigate_to_route',
|
||||
toolName: 'front.navigate_to_route',
|
||||
args: toolArgs,
|
||||
);
|
||||
|
||||
@@ -387,7 +387,7 @@ void main() {
|
||||
expect(
|
||||
() => realService.approveToolCall(
|
||||
toolCallId: toolStart.toolCallId,
|
||||
toolName: 'navigate_to_route',
|
||||
toolName: 'front.navigate_to_route',
|
||||
args: toolArgs,
|
||||
),
|
||||
throwsA(isA<StateError>()),
|
||||
|
||||
@@ -112,13 +112,18 @@ void main() {
|
||||
});
|
||||
|
||||
group('tryForceTrigger', () {
|
||||
test('returns ForceTriggerResult for "#tool:create_calendar_event {}"', () {
|
||||
final result = engine.tryForceTrigger('#tool:create_calendar_event {}');
|
||||
test(
|
||||
'returns ForceTriggerResult for "#tool:front.navigate_to_route {}"',
|
||||
() {
|
||||
final result = engine.tryForceTrigger(
|
||||
'#tool:front.navigate_to_route {}',
|
||||
);
|
||||
|
||||
expect(result, isNotNull);
|
||||
expect(result!.toolName, 'create_calendar_event');
|
||||
expect(result.args, isEmpty);
|
||||
});
|
||||
expect(result, isNotNull);
|
||||
expect(result!.toolName, 'front.navigate_to_route');
|
||||
expect(result.args, isEmpty);
|
||||
},
|
||||
);
|
||||
|
||||
test(
|
||||
'returns ForceTriggerResult with args for "#tool:custom {"key": "value"}"',
|
||||
|
||||
@@ -194,7 +194,7 @@ void main() {
|
||||
service.onEvent(
|
||||
ToolCallStartEvent(
|
||||
toolCallId: 'tc_1',
|
||||
toolCallName: 'create_calendar_event',
|
||||
toolCallName: 'back.mutate_calendar_event',
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -203,7 +203,7 @@ void main() {
|
||||
(s) {
|
||||
final item = s.items.first;
|
||||
return item is ToolCallItem &&
|
||||
item.toolName == 'create_calendar_event' &&
|
||||
item.toolName == 'back.mutate_calendar_event' &&
|
||||
item.status == ToolCallStatus.pending;
|
||||
},
|
||||
'has pending tool call',
|
||||
@@ -220,7 +220,7 @@ void main() {
|
||||
ToolCallItem(
|
||||
id: 'tc_1',
|
||||
callId: 'tc_1',
|
||||
toolName: 'navigate_to_route',
|
||||
toolName: 'front.navigate_to_route',
|
||||
args: {'target': '/calendar/dayweek', '__nonce': 'nonce_1'},
|
||||
status: ToolCallStatus.executing,
|
||||
timestamp: DateTime.now(),
|
||||
@@ -241,5 +241,40 @@ void main() {
|
||||
isA<ChatState>().having((s) => s.items.isEmpty, 'items empty', true),
|
||||
],
|
||||
);
|
||||
|
||||
blocTest<ChatBloc, ChatState>(
|
||||
'toolCallResult with ui in payload.result adds ToolResultItem',
|
||||
build: () => chatBloc,
|
||||
seed: () => ChatState(
|
||||
items: [
|
||||
ToolCallItem(
|
||||
id: 'tc_2',
|
||||
callId: 'tc_2',
|
||||
toolName: 'back.mutate_calendar_event',
|
||||
args: {'operation': 'create'},
|
||||
status: ToolCallStatus.executing,
|
||||
timestamp: DateTime.now(),
|
||||
sender: MessageSender.ai,
|
||||
),
|
||||
],
|
||||
),
|
||||
act: (bloc) {
|
||||
service.onEvent(
|
||||
ToolCallResultEvent(
|
||||
messageId: 'msg_tool_2',
|
||||
toolCallId: 'tc_2',
|
||||
content:
|
||||
'{"result":{"type":"calendar_operation.v1","version":"v1","data":{"operation":"delete","ok":true,"message":"done"},"actions":[]}}',
|
||||
),
|
||||
);
|
||||
},
|
||||
expect: () => [
|
||||
isA<ChatState>().having(
|
||||
(s) => s.items.first is ToolResultItem,
|
||||
'first item is ToolResultItem',
|
||||
true,
|
||||
),
|
||||
],
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@ void main() {
|
||||
});
|
||||
|
||||
group('getTool', () {
|
||||
test('returns tool definition for create_calendar_event', () {
|
||||
final tool = ToolRegistry.getTool('create_calendar_event');
|
||||
test('returns tool definition for front.navigate_to_route', () {
|
||||
final tool = ToolRegistry.getTool('front.navigate_to_route');
|
||||
|
||||
expect(tool, isNotNull);
|
||||
expect(tool!.name, 'create_calendar_event');
|
||||
expect(tool!.name, 'front.navigate_to_route');
|
||||
expect(tool.description, isNotEmpty);
|
||||
});
|
||||
|
||||
@@ -26,26 +26,16 @@ void main() {
|
||||
});
|
||||
|
||||
group('validateArgs', () {
|
||||
test('returns error for empty args (missing title)', () {
|
||||
final result = ToolRegistry.validateArgs('create_calendar_event', {});
|
||||
test('returns error for empty args (missing target)', () {
|
||||
final result = ToolRegistry.validateArgs('front.navigate_to_route', {});
|
||||
|
||||
expect(result.ok, false);
|
||||
expect(result.error, contains('title'));
|
||||
expect(result.error, contains('target'));
|
||||
});
|
||||
|
||||
test('returns error when missing startAt', () {
|
||||
final result = ToolRegistry.validateArgs('create_calendar_event', {
|
||||
'title': 'Test Event',
|
||||
});
|
||||
|
||||
expect(result.ok, false);
|
||||
expect(result.error, contains('startAt'));
|
||||
});
|
||||
|
||||
test('returns ok: true for valid args with title and startAt', () {
|
||||
final result = ToolRegistry.validateArgs('create_calendar_event', {
|
||||
'title': 'x',
|
||||
'startAt': 'x',
|
||||
test('returns ok: true for valid args', () {
|
||||
final result = ToolRegistry.validateArgs('front.navigate_to_route', {
|
||||
'target': '/settings',
|
||||
});
|
||||
|
||||
expect(result.ok, true);
|
||||
@@ -61,17 +51,6 @@ void main() {
|
||||
});
|
||||
|
||||
group('execute', () {
|
||||
test('returns eventId on success', () async {
|
||||
final result = await ToolRegistry.execute('create_calendar_event', {
|
||||
'title': 'Test Meeting',
|
||||
'startAt': '2026-03-01T10:00:00Z',
|
||||
});
|
||||
|
||||
expect(result['eventId'], isNotNull);
|
||||
expect(result['ok'], true);
|
||||
expect(result['title'], 'Test Meeting');
|
||||
});
|
||||
|
||||
test('throws ToolNotFoundException for unknown tool', () async {
|
||||
expect(
|
||||
() => ToolRegistry.execute('unknown_tool', {}),
|
||||
@@ -79,22 +58,8 @@ void main() {
|
||||
);
|
||||
});
|
||||
|
||||
test('includes optional fields in result', () async {
|
||||
final result = await ToolRegistry.execute('create_calendar_event', {
|
||||
'title': 'Test',
|
||||
'startAt': '2026-03-01T10:00:00Z',
|
||||
'description': 'Description',
|
||||
'location': 'Room A',
|
||||
'endAt': '2026-03-01T11:00:00Z',
|
||||
});
|
||||
|
||||
expect(result['description'], 'Description');
|
||||
expect(result['location'], 'Room A');
|
||||
expect(result['endAt'], '2026-03-01T11:00:00Z');
|
||||
});
|
||||
|
||||
test('navigate_to_route rejects disallowed target', () async {
|
||||
final result = await ToolRegistry.execute('navigate_to_route', {
|
||||
test('front.navigate_to_route rejects disallowed target', () async {
|
||||
final result = await ToolRegistry.execute('front.navigate_to_route', {
|
||||
'target': '/admin',
|
||||
});
|
||||
|
||||
@@ -102,23 +67,26 @@ void main() {
|
||||
expect(result['error'], contains('not allowed'));
|
||||
});
|
||||
|
||||
test('navigate_to_route executes allowed target when navigator is bound', () async {
|
||||
String? navigatedTo;
|
||||
bool replaced = false;
|
||||
RouteNavigationTool.instance.bindNavigator((target, {replace = false}) {
|
||||
navigatedTo = target;
|
||||
replaced = replace;
|
||||
});
|
||||
test(
|
||||
'front.navigate_to_route executes allowed target when navigator is bound',
|
||||
() async {
|
||||
String? navigatedTo;
|
||||
bool replaced = false;
|
||||
RouteNavigationTool.instance.bindNavigator((target, {replace = false}) {
|
||||
navigatedTo = target;
|
||||
replaced = replace;
|
||||
});
|
||||
|
||||
final result = await ToolRegistry.execute('navigate_to_route', {
|
||||
'target': '/settings',
|
||||
'replace': true,
|
||||
});
|
||||
final result = await ToolRegistry.execute('front.navigate_to_route', {
|
||||
'target': '/settings',
|
||||
'replace': true,
|
||||
});
|
||||
|
||||
expect(result['ok'], true);
|
||||
expect(navigatedTo, '/settings');
|
||||
expect(replaced, true);
|
||||
});
|
||||
expect(result['ok'], true);
|
||||
expect(navigatedTo, '/settings');
|
||||
expect(replaced, true);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
group('getAllTools', () {
|
||||
@@ -126,7 +94,8 @@ void main() {
|
||||
final tools = ToolRegistry.getAllTools();
|
||||
|
||||
expect(tools, isNotEmpty);
|
||||
expect(tools.any((t) => t.name == 'create_calendar_event'), true);
|
||||
expect(tools.any((t) => t.name == 'front.navigate_to_route'), true);
|
||||
expect(tools.any((t) => t.name == 'create_calendar_event'), false);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -94,6 +94,61 @@ void main() {
|
||||
expect(find.text('AI生成'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('calendar_card.v1 renders agent generated tag', (tester) async {
|
||||
final card = UiCard(
|
||||
cardType: 'calendar_card.v1',
|
||||
data: CalendarCardData(
|
||||
id: 'evt_001',
|
||||
title: 'Meeting',
|
||||
startAt: '2026-03-01T10:00:00Z',
|
||||
sourceType: 'agent_generated',
|
||||
).toJson(),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(home: Scaffold(body: UiSchemaRenderer.render(card))),
|
||||
);
|
||||
|
||||
expect(find.text('AI生成'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('calendar_event_list.v1 renders list items', (tester) async {
|
||||
final card = UiCard(
|
||||
cardType: 'calendar_event_list.v1',
|
||||
data: {
|
||||
'items': [
|
||||
{'id': 'evt_1', 'title': '晨会'},
|
||||
{'id': 'evt_2', 'title': '评审'},
|
||||
],
|
||||
'pagination': {'page': 1, 'total': 2},
|
||||
},
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(home: Scaffold(body: UiSchemaRenderer.render(card))),
|
||||
);
|
||||
|
||||
expect(find.text('日程列表'), findsOneWidget);
|
||||
expect(find.text('晨会'), findsOneWidget);
|
||||
expect(find.text('评审'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('calendar_operation.v1 renders operation message', (
|
||||
tester,
|
||||
) async {
|
||||
final card = UiCard(
|
||||
cardType: 'calendar_operation.v1',
|
||||
data: {'operation': 'delete', 'ok': true, 'message': '日程已删除'},
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(home: Scaffold(body: UiSchemaRenderer.render(card))),
|
||||
);
|
||||
|
||||
expect(find.text('日程delete结果'), findsOneWidget);
|
||||
expect(find.text('日程已删除'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('error_card.v1 renders error message', (tester) async {
|
||||
final card = UiCard(
|
||||
cardType: 'error_card.v1',
|
||||
|
||||
@@ -1,12 +1,36 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:lucide_icons/lucide_icons.dart';
|
||||
import 'package:social_app/core/api/api_exception.dart';
|
||||
import 'package:social_app/features/home/data/voice_recorder.dart';
|
||||
import 'package:social_app/features/home/ui/screens/home_screen.dart';
|
||||
|
||||
class _FakeVoiceRecorder implements VoiceRecorder {
|
||||
bool started = false;
|
||||
String? stoppedPath;
|
||||
|
||||
@override
|
||||
Future<void> start() async {
|
||||
started = true;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<String?> stop() async {
|
||||
started = false;
|
||||
stoppedPath = '/tmp/test-audio.wav';
|
||||
return stoppedPath;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> dispose() async {}
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('HomeScreen Widget Tests', () {
|
||||
testWidgets('displays input field', (WidgetTester tester) async {
|
||||
await tester.pumpWidget(const MaterialApp(home: HomeScreen()));
|
||||
await tester.pumpWidget(
|
||||
const MaterialApp(home: HomeScreen(autoLoadHistory: false)),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byType(TextField), findsOneWidget);
|
||||
@@ -14,7 +38,9 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('displays header icons', (WidgetTester tester) async {
|
||||
await tester.pumpWidget(const MaterialApp(home: HomeScreen()));
|
||||
await tester.pumpWidget(
|
||||
const MaterialApp(home: HomeScreen(autoLoadHistory: false)),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byIcon(LucideIcons.settings), findsOneWidget);
|
||||
@@ -25,10 +51,116 @@ void main() {
|
||||
testWidgets('displays send or mic icon based on input', (
|
||||
WidgetTester tester,
|
||||
) async {
|
||||
await tester.pumpWidget(const MaterialApp(home: HomeScreen()));
|
||||
await tester.pumpWidget(
|
||||
const MaterialApp(home: HomeScreen(autoLoadHistory: false)),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byIcon(LucideIcons.mic), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('tap mic starts recording and shows listening state', (
|
||||
WidgetTester tester,
|
||||
) async {
|
||||
final fakeRecorder = _FakeVoiceRecorder();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: HomeScreen(voiceRecorder: fakeRecorder, autoLoadHistory: false),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.byIcon(LucideIcons.mic));
|
||||
await tester.pump();
|
||||
|
||||
expect(fakeRecorder.started, true);
|
||||
expect(find.text('正在聆听...'), findsOneWidget);
|
||||
expect(find.byIcon(LucideIcons.square), findsOneWidget);
|
||||
expect(find.byIcon(LucideIcons.send), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('tap send while recording transcribes and auto sends message', (
|
||||
WidgetTester tester,
|
||||
) async {
|
||||
final fakeRecorder = _FakeVoiceRecorder();
|
||||
String? sentTranscript;
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: HomeScreen(
|
||||
voiceRecorder: fakeRecorder,
|
||||
autoLoadHistory: false,
|
||||
onTranscribeAudio: (filePath) async {
|
||||
expect(filePath, '/tmp/test-audio.wav');
|
||||
return '语音自动发送';
|
||||
},
|
||||
onAutoSendTranscript: (transcript) async {
|
||||
sentTranscript = transcript;
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.byIcon(LucideIcons.mic));
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(LucideIcons.send));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(sentTranscript, '语音自动发送');
|
||||
expect(find.byIcon(LucideIcons.plus), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('tap stop transcribes audio and fills input', (
|
||||
WidgetTester tester,
|
||||
) async {
|
||||
final fakeRecorder = _FakeVoiceRecorder();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: HomeScreen(
|
||||
voiceRecorder: fakeRecorder,
|
||||
autoLoadHistory: false,
|
||||
onTranscribeAudio: (filePath) async {
|
||||
expect(filePath, '/tmp/test-audio.wav');
|
||||
return '语音转文字结果';
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.byIcon(LucideIcons.mic));
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(LucideIcons.square));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('语音转文字结果'), findsOneWidget);
|
||||
expect(find.byIcon(LucideIcons.plus), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('tap stop shows readable unauthorized message', (
|
||||
WidgetTester tester,
|
||||
) async {
|
||||
final fakeRecorder = _FakeVoiceRecorder();
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: HomeScreen(
|
||||
voiceRecorder: fakeRecorder,
|
||||
autoLoadHistory: false,
|
||||
onTranscribeAudio: (_) async {
|
||||
throw const UnauthorizedException();
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.byIcon(LucideIcons.mic));
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(LucideIcons.square));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('请重新登录'), findsOneWidget);
|
||||
await tester.pump(const Duration(seconds: 3));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user