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.
TypeScript 3d-modelingagent-frameworkagent-harnessai-agentscadclaude-codecodexcoding-agentsdeveloper-toolsesp32game-developmentmcp-servermulti-agentopen-hardwareopencodeopenharnesspcbroboticsterminaltmux
fix(desktop): an earlier-page read during a poll reads earlier pages, and the poll keeps them (#1854)
0xken156ca9023703a9
diff --git a/desktop/lib/super_tabs/controller.dart b/desktop/lib/super_tabs/controller.dartindex 6bef55c55..c3df85640 100644--- a/desktop/lib/super_tabs/controller.dart+++ b/desktop/lib/super_tabs/controller.dart@@ -255,7 +255,10 @@ class SuperTabController extends ChangeNotifier {/// read, as the backend's page cursor names it (section 4.6). Null at the/// start of the conversation.final _before = <String, SuperTabPage?>{};- final _reading = <String, Future<void>>{};++ /// Each conversation's reads under way, newest and older apart: an older+ /// page asked for during a poll's read is a read of its own.+ final _reading = <(String, bool), Future<void>>{};final expandedProjects = <String>{};final expandedMachines = <String>{};bool devicesSelected = false;@@ -1370,7 +1373,9 @@ class SuperTabController extends ChangeNotifier {/// On first open only for the conversation the saved state named; after/// that, for a conversation the state has and no read of it under way.String? _earlyQuery(String id) {- if (!_policy.messagesWithState || _reading.containsKey(id)) return null;+ if (!_policy.messagesWithState || _reading.containsKey((id, false))) {+ return null;+ }final known = snapshot == null? _savedSelection: snapshot!.conversation(id) != null;@@ -1410,7 +1415,8 @@ class SuperTabController extends ChangeNotifier {}}- /// Joins a read of [id] already under way, so a caller can wait for it.+ /// Joins a read of [id] in the same direction already under way, so a+ /// caller can wait for it.Future<void> loadMessages(String id, {bool older = false}) {if (older) _acted();return _readMessages(id, older: older);@@ -1423,11 +1429,11 @@ class SuperTabController extends ChangeNotifier {bool older = false,bool light = false,_EarlyRead? early,- }) => _reading[id] ??=+ }) => _reading[(id, older)] ??=_loadMessages(id, older: older, light: light, early: early).whenComplete(() {// A block: whenComplete would wait on the removed future, itself.- _reading.remove(id);+ _reading.remove((id, older));},);@@ -1447,6 +1453,7 @@ class SuperTabController extends ChangeNotifier {? known.last.sequence: null;final query = _query(id, older: older);+ final from = _before[id];final first = early != null && early.query == query ? early.page : null;var answer = first != null? await first.catchError(@@ -1485,6 +1492,14 @@ class SuperTabController extends ChangeNotifier {if (_disposed || accessRevoked || snapshot?.conversation(id) == null) {return;}+ // A read replacing the saved page moved where earlier continues while+ // this page was on its way: under the new page it would leave a gap.+ // Read on from where earlier continues now.+ if (older &&+ (_before[id]?.sequence != from?.sequence ||+ _before[id]?.id != from?.id)) {+ return await _loadMessages(id, older: true);+ }final incoming = (answer['messages'] as List).map((m) => SuperTabMessage.fromJson(superTabMap(m))).toList();@@ -1544,6 +1559,13 @@ class SuperTabController extends ChangeNotifier {}_keepRows(id, receipt['messages'] as List);}+ // An older page read meanwhile (during the receipt read above) stays:+ // what is held now, under what this read brought.+ if (!replacing) {+ for (final m in _messages[id] ?? <SuperTabMessage>[]) {+ combined.putIfAbsent(m.id, () => m);+ }+ }final next = combined.values.toList()..sort(superTabMessageOrder);// An adapting read that found nothing new changes nothing on screen.final same = _policy.adapts && _sameMessages(_messages[id], next);diff --git a/desktop/test/super_tab_message_paging_test.dart b/desktop/test/super_tab_message_paging_test.dartindex 059040b93..31cfcd911 100644--- a/desktop/test/super_tab_message_paging_test.dart+++ b/desktop/test/super_tab_message_paging_test.dart@@ -1,3 +1,5 @@+import 'dart:async';+import 'package:flutter_test/flutter_test.dart';import 'support/super_tab_fixture.dart';@@ -37,6 +39,83 @@ void main() {},);+ test('older read during an open poll read still asks before=', () async {+ final server = ConversationServer()..messagePage = 2;+ for (final text in ['one', 'two', 'three', 'four']) {+ server.append(text);+ }+ final c = server.controller();+ await c.refresh();+ final reads = <String>[];+ server.onRead = reads.add;+ final slow = server.holdReads = Completer<void>();++ // The poll's read of new messages is open when the reader scrolls up.+ final newest = c.loadMessages('lead');+ final older = c.loadMessages('lead', older: true);+ server.holdReads = null;+ slow.complete();+ await Future.wait([newest, older]);++ expect(reads, contains(endsWith('messages?before=3&beforeId=message-3')));+ expect(c.messages('lead').map((m) => m.text), [+ 'one',+ 'two',+ 'three',+ 'four',+ ]);+ });++ test(+ 'an older page that lands while a poll reads its receipt is kept',+ () async {+ final server = ConversationServer()..messagePage = 2;+ for (final text in ['one', 'two', 'mine']) {+ server.append(text);+ }+ // The reader's own message, not yet answered: a read past it asks for+ // its receipt again.+ server.messages.last['deliveries'] = [+ {'agentId': 'lead-agent', 'status': 'delivered'},+ ];+ final c = server.controller();+ await c.refresh();+ for (final text in ['r1', 'r2', 'r3']) {+ server.append(text);+ server.messages.last['author'] = {+ 'kind': 'agent',+ 'id': 'lead-agent',+ 'name': 'Lead',+ };+ }+ final reads = <String>[];+ server.onRead = reads.add;+ final pages = server.holdReads = Completer<void>();++ var newestDone = false;+ final newest = c.loadMessages('lead').then((_) => newestDone = true);+ final older = c.loadMessages('lead', older: true);+ // Both pages go; the poll's receipt read that follows waits.+ final receipt = server.holdReads = Completer<void>();+ pages.complete();+ await older;+ await pumpEventQueue();+ expect(newestDone, isFalse, reason: 'its receipt read is still open');+ server.holdReads = null;+ receipt.complete();+ await newest;+ expect(reads.last, contains('messageId=message-3'));++ expect(c.messages('lead').map((m) => m.text), [+ 'one',+ 'two',+ 'mine',+ 'r1',+ 'r2',+ ]);+ },+ );+test('a new message is read after the newest one', () async {final server = ConversationServer()..append('one');final c = server.controller();diff --git a/desktop/test/super_tab_saved_view_test.dart b/desktop/test/super_tab_saved_view_test.dartindex 4b7a45625..ee5a7bd24 100644--- a/desktop/test/super_tab_saved_view_test.dart+++ b/desktop/test/super_tab_saved_view_test.dart@@ -159,6 +159,9 @@ class _Reads {final paths = <String>[];bool missing = false;Completer<void>? holdMessages;++ /// Holds the reads of an earlier page alone.+ Completer<void>? holdOlder;Future<Map<String, dynamic>> call(String method,String path, {@@ -168,6 +171,9 @@ class _Reads {if (holdMessages case final hold? when path.endsWith('/messages')) {await hold.future;}+ if (holdOlder case final hold? when path.contains('/messages?before=')) {+ await hold.future;+ }if (missing) {return Future.error(const SuperTabFailure(@@ -1093,6 +1099,43 @@ void _reviewTests() {});});+ test(+ 'an earlier page asked for over the saved view leaves no gap when the '+ 'read replacing that view lands first',+ () {+ final server = ConversationServer();+ for (var i = 1; i <= 120; i++) {+ server.append('m$i');+ }+ final view = _saved(server);+ fakeAsync((async) {+ for (var i = 121; i <= 270; i++) {+ server.append('m$i');+ }+ final reads = _Reads(server)..holdOlder = Completer<void>();+ final c = _controller(reads)+ ..drawSaved(view)+ ..start();+ // Scrolled up at once: from where the saved page said earlier+ // continues, while the read replacing that page is on its way.+ unawaited(c.loadMessages('lead', older: true));+ async.flushMicrotasks();+ expect(c.messages('lead').first.text, 'm171');+ reads.holdOlder!.complete();+ reads.holdOlder = null;+ async.flushMicrotasks();++ final sequences = c.messages('lead').map((m) => m.sequence).toList();+ expect(sequences.last, 270);+ for (var i = 1; i < sequences.length; i++) {+ expect(sequences[i], sequences[i - 1] + 1, reason: 'at $i');+ }+ expect(c.hasOlder('lead'), sequences.first > 1);+ c.dispose();+ });+ },+ );+// Finding 2.test('nothing is written back while the saved view is on screen', () {fakeAsync((async) {