Skip to content

The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.

Merge batch 11-04 b0855: #2869 (#2873)

0xken151b53d65c209e
diff --git a/desktop/lib/super_tabs/view.dart b/desktop/lib/super_tabs/view.dart
index f63dfa76c..0eae28378 100644
--- a/desktop/lib/super_tabs/view.dart
+++ b/desktop/lib/super_tabs/view.dart
@@ -3542,6 +3542,11 @@ class _SuperTabViewState extends State<SuperTabView>
? c.snapshot?.agent(message.authorId)
: null;
final previous = index > 0 ? entries[index - 1].message : null;
+ // Grouping is decided on the task's own rows; a step's row drawn between
+ // two of them still ends the group, or the next would read as its agent's.
+ final joined =
+ grouped.contains(message.id) &&
+ previous?.conversationId == message.conversationId;
final time = message.createdAt;
return SuperTabDayMark(
key: ValueKey(_rowKey(c.messageIdentity(message.id))),
@@ -3570,7 +3575,7 @@ class _SuperTabViewState extends State<SuperTabView>
? _outgoingRow(
pendingById[message.id]!,
byId,
- grouped: grouped.contains(message.id),
+ grouped: joined,
)
: entry.interruptions > 0
? SuperTabRecordingNotice(
@@ -3583,7 +3588,7 @@ class _SuperTabViewState extends State<SuperTabView>
)
: _message(
message,
- grouped.contains(message.id),
+ joined,
byId,
showReceipt: message.id == latestOwn?.id,
),
diff --git a/desktop/test/super_tab_message_grouping_test.dart b/desktop/test/super_tab_message_grouping_test.dart
index cd338f04e..269c1806d 100644
--- a/desktop/test/super_tab_message_grouping_test.dart
+++ b/desktop/test/super_tab_message_grouping_test.dart
@@ -1,11 +1,14 @@
+import 'dart:async';
import 'dart:io';
import 'dart:ui' as ui;
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:harness/shared/theme/app_theme.dart' as grid;
+import 'package:harness/super_tabs/controller.dart';
import 'package:harness/super_tabs/message_row.dart';
import 'package:harness/super_tabs/model.dart';
import 'package:harness/super_tabs/thread_panel.dart';
@@ -347,6 +350,187 @@ void main() {
}
});
+ group("with a step's row between", () {
+ /// Diego's case: a task's chat shows its step's rows by time, and a
+ /// person's second line after a step agent's row read as that agent's.
+ const reviewer = {
+ 'kind': 'agent',
+ 'id': 'reviewer',
+ 'name': 'Reviewer',
+ 'displayName': 'Merlin',
+ };
+
+ Future<(ConversationServer, SuperTabController)> show(
+ WidgetTester tester, {
+ bool stepBetween = true,
+ Map<String, Object> author = ken,
+ Brightness brightness = Brightness.light,
+ Key? picture,
+ DateTime? at,
+ }) async {
+ grid.AppTheme.brightness.value = brightness;
+ addTearDown(() => grid.AppTheme.brightness.value = Brightness.light);
+ await tester.binding.setSurfaceSize(const Size(1400, 900));
+ addTearDown(() => tester.binding.setSurfaceSize(null));
+ final server = ConversationServer()..threads = true;
+ for (final (id, name, shown) in [
+ ('pm', 'Lead', 'River'),
+ ('reviewer', 'Reviewer', 'Merlin'),
+ ]) {
+ (server.state['agents'] as List).add({
+ 'id': id,
+ 'projectId': 'lead',
+ 'name': name,
+ 'displayName': shown,
+ 'machineId': 'studio',
+ 'harnessId': 'h-$id',
+ 'contributorId': 'owner',
+ 'configuration': {'engine': 'claude', 'model': 'opus'},
+ });
+ }
+ (server.state['people'] as List).add({
+ 'id': 'ken',
+ 'email': '[email protected]',
+ 'role': 'collaborator',
+ });
+ (server.state['conversations'] as List)
+ .cast<Map<String, dynamic>>()
+ .firstWhere((g) => g['id'] == 'offline')['leadId'] =
+ 'pm';
+ (server.state['conversations'] as List).add(<String, dynamic>{
+ ...conversationFixture('review', 'Review'),
+ 'number': 31,
+ 'reviewOf': 'offline',
+ 'step': 'Review',
+ });
+ final from = at ?? start;
+ void say(
+ String text,
+ String conversationId,
+ Map<String, Object> sender,
+ int minutes,
+ ) {
+ server.append(text, conversationId: conversationId);
+ server.messages.last
+ ..['author'] = sender
+ ..['createdAt'] = from
+ .add(Duration(minutes: minutes))
+ .toUtc()
+ .toIso8601String();
+ }
+
+ say('First line.', 'offline', author, 0);
+ if (stepBetween) say('Review started.', 'review', reviewer, 1);
+ say('Second line.', 'offline', author, 3);
+ say('Third line.', 'offline', author, 4);
+ final c = server.controller();
+ await c.refresh();
+ addTearDown(c.dispose);
+ c.select('offline');
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: grid.buildAppTheme(brightness: brightness),
+ builder: (context, child) =>
+ RepaintBoundary(key: picture, child: child),
+ home: Scaffold(
+ body: SuperTabView(
+ controller: c,
+ onInvite: () {},
+ onAddAgent: (_) {},
+ onOpenTerminal: (_) {},
+ machineName: (_) => 'Mac Studio',
+ ),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ return (server, c);
+ }
+
+ Finder rowOf(String text) => find.ancestor(
+ of: find.text(text),
+ matching: find.byType(SuperTabMessageRow),
+ );
+ bool grouped(WidgetTester tester, String text) =>
+ tester.widget<SuperTabMessageRow>(rowOf(text)).grouped;
+
+ testWidgets("the person's next line shows its own name again", (
+ tester,
+ ) async {
+ await show(tester);
+ expect(find.text('Review started.'), findsOneWidget);
+ expect(grouped(tester, 'First line.'), isFalse);
+ expect(grouped(tester, 'Second line.'), isFalse);
+ expect(
+ find.descendant(of: rowOf('Second line.'), matching: find.text('ken')),
+ findsOneWidget,
+ );
+ // The line after it has their own row above, so it joins as ever.
+ expect(grouped(tester, 'Third line.'), isTrue);
+ });
+
+ testWidgets('with no step row between, the lines still group', (
+ tester,
+ ) async {
+ await show(tester, stepBetween: false);
+ expect(grouped(tester, 'First line.'), isFalse);
+ expect(grouped(tester, 'Second line.'), isTrue);
+ expect(grouped(tester, 'Third line.'), isTrue);
+ });
+
+ testWidgets('a line still sending keeps its name under a step row', (
+ tester,
+ ) async {
+ final (server, c) = await show(
+ tester,
+ author: const {
+ 'kind': 'person',
+ 'id': 'owner',
+ 'name': '[email protected]',
+ },
+ at: DateTime.now().subtract(const Duration(minutes: 5)),
+ );
+ // The step's row is the newest, drawn just above what is sent next.
+ server.append('Review passed.', conversationId: 'review');
+ server.messages.last
+ ..['author'] = reviewer
+ ..['createdAt'] = DateTime.now().toUtc().toIso8601String();
+ await c.refresh();
+ await tester.pumpAndSettle();
+ expect(find.text('Review passed.'), findsOneWidget);
+ final hold = server.holdCommands = Completer<void>();
+ await tester.enterText(
+ find.byKey(const ValueKey('super-message-composer')),
+ 'Quick line.',
+ );
+ await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+ await tester.pump();
+ await tester.pump(const Duration(milliseconds: 50));
+ expect(grouped(tester, 'Quick line.'), isFalse);
+ hold.complete();
+ await tester.pumpAndSettle();
+ await tester.pumpWidget(const SizedBox());
+ await c.flush();
+ });
+
+ for (final brightness in Brightness.values) {
+ testWidgets('screenshot for review (${brightness.name})', (tester) async {
+ final picture = GlobalKey();
+ await show(tester, brightness: brightness, picture: picture);
+ final boundary =
+ picture.currentContext!.findRenderObject()!
+ as RenderRepaintBoundary;
+ await tester.runAsync(() async {
+ final image = await boundary.toImage(pixelRatio: 2);
+ final bytes = await image.toByteData(format: ui.ImageByteFormat.png);
+ image.dispose();
+ File('$shots/step-between-${brightness.name}.png')
+ .writeAsBytesSync(bytes!.buffer.asUint8List());
+ });
+ }, skip: shots == null);
+ }
+ });
+
group('on screen', () {
/// Huy's case: three Buddy messages in two minutes, a report and a
/// question among them, then a reply thread on the first.