feat(app): chat sections are clear collapsible dividers; closed chats start collapsed

This commit is contained in:
2026-10-24 00:22:18 +01:00
parent d0b1c8e524
commit 1e55b8d2b3
16 changed files with 293 additions and 161 deletions
@@ -1,5 +1,5 @@
import '../../../../ui/layout/collapsible_list_section.dart';
import '../../../../ui/theme/app_theme.dart';
import '../../../../ui/layout/section_heading.dart';
import 'package:flutter/cupertino.dart';
import '../../../../core/api_gateway.dart';
@@ -58,23 +58,32 @@ class CupertinoSessionList extends StatelessWidget {
);
}
List<CupertinoListSection> _section(ChatSessionSection section) {
List<Widget> _section(ChatSessionSection section) {
final groups = groupChatSessions(section.sessions);
// Closed chats start folded away; the live ones start open.
return [
for (final group in groups)
CupertinoListSection.insetGrouped(
backgroundColor: AppColors.groupedBackground,
// Styled as a section divider, not as another chat row.
header: Builder(
builder: (context) => Text(
groups.length > 1
? '${section.title} · ${group.directory.isEmpty ? 'No directory' : group.directory}'
: section.title,
style: SectionHeadingStyle.of(context).title,
CollapsibleListSection(
key: ValueKey('chat-section-${section.title}'),
title: section.title,
count: section.sessions.length,
initiallyOpen: section.title != 'Closed',
children: [
for (final group in groups)
CupertinoListSection.insetGrouped(
backgroundColor: AppColors.groupedBackground,
header: groups.length > 1
? Text(
group.directory.isEmpty
? 'No directory'
: group.directory,
)
: null,
children: [
for (final session in group.sessions) ..._row(session),
],
),
),
children: [for (final session in group.sessions) ..._row(session)],
),
],
),
];
}
@@ -1,3 +1,4 @@
import '../../../../ui/layout/collapsible_list_section.dart';
import '../../../../ui/layout/section_heading.dart';
import 'package:flutter/material.dart';
@@ -63,14 +64,12 @@ class MaterialSessionList extends StatelessWidget {
Widget _section(BuildContext context, ChatSessionSection section) {
final groups = groupChatSessions(section.sessions);
final heading = SectionHeadingStyle.of(context);
return ExpansionTile(
// Styled as a section divider, not as another chat row.
title: Text(section.title, style: heading.title),
backgroundColor: heading.background.withValues(alpha: 0.35),
collapsedBackgroundColor: heading.background,
shape: Border(left: BorderSide(color: heading.accent, width: 3)),
collapsedShape: Border(left: BorderSide(color: heading.accent, width: 3)),
initiallyExpanded: true,
// Closed chats start folded away; the live ones start open.
return CollapsibleListSection(
key: ValueKey('chat-section-${section.title}'),
title: section.title,
count: section.sessions.length,
initiallyOpen: section.title != 'Closed',
children: [
for (final group in groups) ...[
if (groups.length > 1)
@@ -0,0 +1,98 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../adaptive/host.dart';
import '../motion/motion.dart';
import 'section_heading.dart';
/// A titled group in a list: a [SectionHeading] strip (bold title, count,
/// chevron) that reads as a divider, and opens or closes its rows on a tap.
class CollapsibleListSection extends StatefulWidget {
const CollapsibleListSection({
super.key,
required this.title,
required this.children,
this.count,
this.initiallyOpen = true,
});
final String title;
final int? count;
final bool initiallyOpen;
final List<Widget> children;
@override
State<CollapsibleListSection> createState() => _CollapsibleListSectionState();
}
class _CollapsibleListSectionState extends State<CollapsibleListSection> {
late bool _open = widget.initiallyOpen;
@override
Widget build(BuildContext context) {
final cupertino = usesCupertinoHost(context);
final muted = cupertino
? CupertinoColors.secondaryLabel.resolveFrom(context)
: Theme.of(context).colorScheme.onSurfaceVariant;
final heading = Semantics(
container: true,
header: true,
button: true,
expanded: _open,
label: widget.title,
excludeSemantics: true,
onTap: _toggle,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: _toggle,
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: SectionHeading(
title: widget.title,
minHeight: 44,
trailing: [
if (widget.count != null)
Padding(
padding: const EdgeInsetsDirectional.only(end: 6),
child: Text(
'${widget.count}',
style: TextStyle(color: muted),
),
),
AnimatedRotation(
turns: _open ? 0.5 : 0,
duration: Motion.of(context, Motion.standard),
curve: Motion.curve,
child: Icon(
cupertino ? CupertinoIcons.chevron_down : Icons.expand_more,
color: muted,
),
),
],
),
),
),
);
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Padding(padding: const EdgeInsets.only(top: 8), child: heading),
ClipRect(
child: AnimatedSize(
duration: Motion.of(context, Motion.standard),
curve: Motion.curve,
alignment: Alignment.topCenter,
child: _open
? Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: widget.children,
)
: const SizedBox(width: double.infinity),
),
),
],
);
}
void _toggle() => setState(() => _open = !_open);
}
@@ -134,9 +134,7 @@ void main() {
expect(gateway.sent('chat_rename'), isEmpty);
expect(
find.text(
'Usage: /rename <title> — renames this session.',
),
find.text('Usage: /rename <title> — renames this session.'),
findsOneWidget,
);
});
@@ -44,28 +44,32 @@ void main() {
expect(chatFormAnswerError(fields, {'note': 'ok', 'count': 5}), '');
});
test('integer input becomes an int, including decimal and exponent forms', () {
final field = <String, dynamic>{'key': 'count', 'type': 'integer'};
expect(chatFormFieldValue(field, '1.0'), isA<int>());
expect(chatFormFieldValue(field, '1.0'), 1);
expect(chatFormFieldValue(field, '1e3'), 1000);
expect(chatFormFieldValue(field, '1.5'), 1.5);
expect((chatFormFieldValue(field, 'nope')! as num).isNaN, isTrue);
expect(chatFormFieldValue({'type': 'number'}, '1e3'), 1000.0);
test(
'integer input becomes an int, including decimal and exponent forms',
() {
final field = <String, dynamic>{'key': 'count', 'type': 'integer'};
expect(chatFormFieldValue(field, '1.0'), isA<int>());
expect(chatFormFieldValue(field, '1.0'), 1);
expect(chatFormFieldValue(field, '1e3'), 1000);
expect(chatFormFieldValue(field, '1.5'), 1.5);
expect((chatFormFieldValue(field, 'nope')! as num).isNaN, isTrue);
expect(chatFormFieldValue({'type': 'number'}, '1e3'), 1000.0);
final fields = [field];
expect(
chatVisibleFormAnswers(
fields,
{'count': chatFormFieldValue(field, '1.0')},
),
{'count': 1},
);
expect(
chatFormAnswerError(fields, {'count': chatFormFieldValue(field, '1.0')}),
'',
);
});
final fields = [field];
expect(
chatVisibleFormAnswers(fields, {
'count': chatFormFieldValue(field, '1.0'),
}),
{'count': 1},
);
expect(
chatFormAnswerError(fields, {
'count': chatFormFieldValue(field, '1.0'),
}),
'',
);
},
);
test('a malformed pattern is reported with the documented wording', () {
final fields = [
@@ -84,9 +88,12 @@ void main() {
// An unparseable server pattern constrains nothing, like a browser ignoring
// an invalid `pattern` attribute.
expect(
chatFormAnswerError([
{'key': 'code', 'type': 'string', 'pattern': '('},
], {'code': 'anything'}),
chatFormAnswerError(
[
{'key': 'code', 'type': 'string', 'pattern': '('},
],
{'code': 'anything'},
),
'',
);
});
@@ -253,9 +253,7 @@ void main() {
) async {
final semantics = tester.ensureSemantics();
await tester.pumpWidget(
scrollHost(
ChatQuestionCard(form: question(), onSubmit: (_, _) async {}),
),
scrollHost(ChatQuestionCard(form: question(), onSubmit: (_, _) async {})),
);
final node = tester.getSemantics(
find.byKey(const ValueKey<String>('chat-question-input-note')),
@@ -296,65 +294,67 @@ void main() {
expect(sent!['count'], isA<int>());
});
testWidgets('decline and cancel send their recorded actions with no answers', (
tester,
) async {
final actions = <String>[];
final answers = <Map<String, dynamic>>[];
await tester.pumpWidget(
scrollHost(
ChatQuestionCard(
form: question(),
onSubmit: (sent, action) async {
actions.add(action);
answers.add(sent);
},
testWidgets(
'decline and cancel send their recorded actions with no answers',
(tester) async {
final actions = <String>[];
final answers = <Map<String, dynamic>>[];
await tester.pumpWidget(
scrollHost(
ChatQuestionCard(
form: question(),
onSubmit: (sent, action) async {
actions.add(action);
answers.add(sent);
},
),
),
),
);
await tester.tap(find.text('Decline'));
await tester.pumpAndSettle();
await tester.tap(find.text('Cancel question'));
await tester.pumpAndSettle();
expect(actions, ['decline', 'cancel']);
expect(answers, [<String, dynamic>{}, <String, dynamic>{}]);
});
);
await tester.tap(find.text('Decline'));
await tester.pumpAndSettle();
await tester.tap(find.text('Cancel question'));
await tester.pumpAndSettle();
expect(actions, ['decline', 'cancel']);
expect(answers, [<String, dynamic>{}, <String, dynamic>{}]);
},
);
testWidgets('an all-external form confirms completion without field answers', (
tester,
) async {
Map<String, dynamic>? sent;
String? action;
await tester.pumpWidget(
scrollHost(
ChatQuestionCard(
form: {
'id': 'form-external',
'title': 'Open the form',
'actions': ['accept'],
'fields': [
{
'key': 'form',
'title': 'External form',
'type': 'external',
'url': 'https://example.com/complete',
},
],
},
onSubmit: (answers, next) async {
sent = answers;
action = next;
},
testWidgets(
'an all-external form confirms completion without field answers',
(tester) async {
Map<String, dynamic>? sent;
String? action;
await tester.pumpWidget(
scrollHost(
ChatQuestionCard(
form: {
'id': 'form-external',
'title': 'Open the form',
'actions': ['accept'],
'fields': [
{
'key': 'form',
'title': 'External form',
'type': 'external',
'url': 'https://example.com/complete',
},
],
},
onSubmit: (answers, next) async {
sent = answers;
action = next;
},
),
),
),
);
expect(find.text('Confirm completion'), findsOneWidget);
expect(find.text('https://example.com/complete'), findsOneWidget);
await tester.tap(find.text('Confirm completion'));
await tester.pumpAndSettle();
expect(sent, isEmpty);
expect(action, 'accept');
});
);
expect(find.text('Confirm completion'), findsOneWidget);
expect(find.text('https://example.com/complete'), findsOneWidget);
await tester.tap(find.text('Confirm completion'));
await tester.pumpAndSettle();
expect(sent, isEmpty);
expect(action, 'accept');
},
);
testWidgets('an unsupported external URL shows the web alert wording', (
tester,
@@ -405,7 +405,12 @@ void main() {
'resolved': true,
'answers': {'enabled': true, 'extra': 'kept'},
'fields': [
{'key': 'enabled', 'title': '', 'description': '', 'type': 'boolean'},
{
'key': 'enabled',
'title': '',
'description': '',
'type': 'boolean',
},
],
},
onSubmit: (_, _) async {},
@@ -71,10 +71,7 @@ void main() {
group('arrival count', () {
test('counts only messages after the release point', () {
expect(
chatNewMessageCount(['m1', 'm2', 'm3'], 'm2'),
1,
);
expect(chatNewMessageCount(['m1', 'm2', 'm3'], 'm2'), 1);
expect(
chatNewMessageCount(['older', 'm1', 'm2', 'live', 'newer'], 'm2'),
2,
@@ -98,22 +95,13 @@ void main() {
group('restore', () {
test('no saved position lands on the newest end', () {
expect(
chatRestoreOffset(savedOffset: null, maxScrollExtent: 640),
640,
);
expect(chatRestoreOffset(savedOffset: null, maxScrollExtent: 640), 640);
});
test('a saved position is kept within the current extent', () {
expect(
chatRestoreOffset(savedOffset: 120, maxScrollExtent: 640),
120,
);
expect(chatRestoreOffset(savedOffset: 120, maxScrollExtent: 640), 120);
expect(chatRestoreOffset(savedOffset: 0, maxScrollExtent: 640), 0);
expect(
chatRestoreOffset(savedOffset: 900, maxScrollExtent: 640),
640,
);
expect(chatRestoreOffset(savedOffset: 900, maxScrollExtent: 640), 640);
});
});
@@ -44,15 +44,12 @@ void main() {
});
await pumpEventQueue();
expect(controller.permissionFrames, hasLength(ChatThreadCards.settledLimit + 1));
expect(
controller.permissionFrames.first['request_id'],
'req-5',
);
expect(
controller.permissionFrames.last['request_id'],
'req-pending',
controller.permissionFrames,
hasLength(ChatThreadCards.settledLimit + 1),
);
expect(controller.permissionFrames.first['request_id'], 'req-5');
expect(controller.permissionFrames.last['request_id'], 'req-pending');
});
test('settled forms are bounded while the pending one is kept', () async {
@@ -75,7 +72,10 @@ void main() {
});
await pumpEventQueue();
expect(controller.questionForms, hasLength(ChatThreadCards.settledLimit + 1));
expect(
controller.questionForms,
hasLength(ChatThreadCards.settledLimit + 1),
);
expect(controller.questionForms.first['id'], 'form-5');
expect(controller.questionForms.last['id'], 'form-pending');
});
@@ -35,9 +35,7 @@ JsonMap tallPage() => chatPage([
]);
ScrollController transcriptScroll(WidgetTester tester) =>
tester
.widget<ListView>(find.byKey(const Key('chat-thread-s')))
.controller!;
tester.widget<ListView>(find.byKey(const Key('chat-thread-s'))).controller!;
void main() {
testWidgets('a streaming transcript stays pinned to its newest end', (
@@ -62,7 +60,9 @@ void main() {
// A new message and further deltas grow the turn; every frame keeps the
// newest end visible without an animation the operator has to chase.
gateway.emitEvent(chatTextFrame('One streamed paragraph. ', messageId: 'live'));
gateway.emitEvent(
chatTextFrame('One streamed paragraph. ', messageId: 'live'),
);
await tester.pump();
await tester.pump();
gateway.emitEvent(chatTextFrame('And another delta. ', messageId: 'live'));
@@ -115,19 +115,15 @@ void main() {
// The operator's position is not moved by an arrival; only the
// control's count changes.
expect(scroll.position.pixels, closeTo(releasedAt, 0.5));
expect(
find.text('Jump to latest · 1 new message'),
findsOneWidget,
);
expect(find.text('Jump to latest · 1 new message'), findsOneWidget);
gateway.emitEvent(chatTextFrame('A second answer. ', messageId: 'live-2'));
gateway.emitEvent(
chatTextFrame('A second answer. ', messageId: 'live-2'),
);
await tester.pump();
await tester.pump();
expect(scroll.position.pixels, closeTo(releasedAt, 0.5));
expect(
find.text('Jump to latest · 2 new messages'),
findsOneWidget,
);
expect(find.text('Jump to latest · 2 new messages'), findsOneWidget);
if (cupertino) {
// The affordance is a standard Cupertino control; no Material
@@ -184,7 +184,9 @@ void main() {
]) {
expect(find.text(body), findsOneWidget, reason: body);
}
Navigator.of(tester.element(find.text('NEWEST folded reasoning body.'))).pop();
Navigator.of(
tester.element(find.text('NEWEST folded reasoning body.')),
).pop();
await tester.pumpAndSettle();
expect(
find.text('Load older'),
@@ -41,11 +41,7 @@ void main() {
expect(draft.add(files!.single.attachment), isNull);
expect(
draft.attachments.single,
const ChatAttachment(
name: 'notes.txt',
mime: 'text/plain',
sizeBytes: 3,
),
const ChatAttachment(name: 'notes.txt', mime: 'text/plain', sizeBytes: 3),
);
});
@@ -5,6 +5,7 @@ import 'package:pipelines_app/core/api_gateway.dart';
import 'chat_test_harness.dart';
import 'fake_chat_gateway.dart';
import 'expand_closed.dart';
void main() {
testWidgets('material row star, rename, close confirm and reopen', (
@@ -53,6 +54,7 @@ void main() {
'chat_query': {'session_id': 's2'},
});
await expandClosedChats(tester);
await tester.ensureVisible(find.byKey(const Key('chat-actions-s4')));
await tester.pumpAndSettle();
await tester.tap(find.byKey(const Key('chat-actions-s4')));
@@ -6,6 +6,7 @@ import 'package:pipelines_app/features/chat/ui/sessions/chat_sessions_screen.dar
import 'chat_test_harness.dart';
import 'fake_chat_gateway.dart';
import 'expand_closed.dart';
/// Long enough that a single ellipsised line would visibly lose the reason.
const _refusal =
@@ -93,6 +94,7 @@ void main() {
closed = true;
await tester.tap(find.byKey(const Key('chat-refresh')));
await tester.pumpAndSettle();
await expandClosedChats(tester);
expect(find.text('New'), findsNothing);
expect(
@@ -134,6 +136,7 @@ void main() {
),
);
await tester.pumpAndSettle();
await expandClosedChats(tester);
await tester.ensureVisible(find.byKey(const Key('chat-actions-s4')));
await tester.tap(find.byKey(const Key('chat-actions-s4')));
@@ -185,6 +188,7 @@ void main() {
),
);
await tester.pumpAndSettle();
await expandClosedChats(tester);
await tester.ensureVisible(find.byKey(const Key('chat-actions-s4')));
await tester.tap(find.byKey(const Key('chat-actions-s4')));
@@ -3,6 +3,7 @@ import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pipelines_app/core/api_gateway.dart';
import 'package:pipelines_app/features/chat/ui/sessions/session_list_material.dart';
import 'expand_closed.dart';
/// The Android host: a Material grouped list with its native separators.
Future<void> _pumpRows(
@@ -116,6 +117,7 @@ void main() {
'closed_at': '2026-01-01',
},
], section: 'Closed');
await expandClosedChats(tester);
// The section header also says Closed; the row's trailing word is its own.
expect(
@@ -8,6 +8,7 @@ import 'package:pipelines_app/core/api_gateway.dart';
import 'chat_test_harness.dart';
import 'fake_chat_gateway.dart';
import 'package:pipelines_app/features/chat/ui/sessions/chat_sessions_screen.dart';
import 'expand_closed.dart';
void main() {
testWidgets('deep-linked active chat is marked read when its row loads', (
@@ -64,17 +65,13 @@ void main() {
final gateway = FakeChatGateway()
..sessionsReply = {'chat_sessions': sampleSessions()};
await pumpMaterialChat(tester, gateway);
await expandClosedChats(tester);
expect(find.text('Starred'), findsOneWidget);
expect(find.text('Chats'), findsNWidgets(2));
// The Closed section header, and each closed row's trailing word.
expect(
find.byWidgetPredicate(
(widget) =>
widget is ExpansionTile &&
widget.title is Text &&
(widget.title as Text).data == 'Closed',
),
find.byKey(const ValueKey('chat-section-Closed')),
findsOneWidget,
);
expect(
@@ -112,8 +109,10 @@ void main() {
// The list has no search field; New chat and Refresh are the actions.
expect(find.byType(CupertinoSearchTextField), findsNothing);
expect(find.byType(Scaffold), findsNothing);
expect(find.text('Chats · /work'), findsOneWidget);
expect(find.text('Chats · /else'), findsOneWidget);
// Directory groups sit under their section's heading.
expect(find.byKey(const ValueKey('chat-section-Chats')), findsOneWidget);
expect(find.text('/work'), findsWidgets);
expect(find.text('/else'), findsWidgets);
await tester.tap(find.byKey(const Key('chat-star-s2')));
await tester.pumpAndSettle();
@@ -138,6 +137,8 @@ void main() {
'chat_rename': {'session_id': 's2', 'title': 'Renamed on Cupertino'},
});
await expandClosedChats(tester);
await tester.ensureVisible(find.byKey(const Key('chat-actions-s4')));
await tester.tap(find.byKey(const Key('chat-actions-s4')));
await tester.pumpAndSettle();
await tester.tap(find.text('Reopen'));
@@ -198,4 +199,17 @@ void main() {
);
semantics.dispose();
});
testWidgets('closed chats start folded away behind their heading', (
tester,
) async {
final gateway = FakeChatGateway()
..sessionsReply = {'chat_sessions': sampleSessions()};
await pumpMaterialChat(tester, gateway);
expect(find.byKey(const ValueKey('chat-section-Closed')), findsOneWidget);
expect(find.byKey(const Key('chat-row-s4')), findsNothing);
expect(find.text('Open chat'), findsOneWidget);
await expandClosedChats(tester);
expect(find.byKey(const Key('chat-row-s4')), findsOneWidget);
});
}
@@ -0,0 +1,12 @@
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
/// Closed chats start folded away; opens that section when it is shown.
Future<void> expandClosedChats(WidgetTester tester) async {
final section = find.byKey(const ValueKey('chat-section-Closed'));
if (section.evaluate().isEmpty) return;
final heading = find.descendant(of: section, matching: find.text('Closed'));
await tester.ensureVisible(heading.first);
await tester.tap(heading.first);
await tester.pumpAndSettle();
}