Skip to content

Open source Grok Bot alternative, Bring your own agent and subscription: message Claude Code, Codex, Gemini CLI, Cursor, Copilot and 40+ AI agents as bots on your own computer, from iPhone, Mac, Windows, Linux or terminal. Agent-agnostic and free. Also a Muse and Dots alternative. Built in Rust.

fix(kit): keep incoming messages in distinct rows

Sean Fergusone5c4006c31fc
diff --git a/apps/ios/Kit/Sources/CodyncUI/Thread/ThreadView.swift b/apps/ios/Kit/Sources/CodyncUI/Thread/ThreadView.swift
index efb75882..f0e8f312 100644
--- a/apps/ios/Kit/Sources/CodyncUI/Thread/ThreadView.swift
+++ b/apps/ios/Kit/Sources/CodyncUI/Thread/ThreadView.swift
@@ -256,7 +256,14 @@ struct ChatItem: Identifiable {
: entries.last.flatMap { $0.kind == "agent" && $0.data.final == false ? $0.id : nil }
for e in entries where e.isChat || (e.id == live && !(e.data.text ?? "").isEmpty && e.data.text != "(pass)") {
let date = e.date
- var id = e.kind == "user" ? e.data.clientNonce.map { "user-\($0)" } ?? e.id : e.id
+ // Bot-originated messages carry an empty nonce. Their entry IDs
+ // distinguish them; only real nonces identify optimistic echoes.
+ var id: String
+ if e.kind == "user", let nonce = e.data.clientNonce, !nonce.isEmpty {
+ id = "user-\(nonce)"
+ } else {
+ id = e.id
+ }
if steady, e.kind == "agent", !used.contains("reply-\(e.data.author ?? "")-\(e.turn)") {
id = "reply-\(e.data.author ?? "")-\(e.turn)"
}
diff --git a/apps/ios/Kit/Tests/CodyncUITests/ChatItemTests.swift b/apps/ios/Kit/Tests/CodyncUITests/ChatItemTests.swift
index e6f3190d..d338c6b6 100644
--- a/apps/ios/Kit/Tests/CodyncUITests/ChatItemTests.swift
+++ b/apps/ios/Kit/Tests/CodyncUITests/ChatItemTests.swift
@@ -84,3 +84,30 @@ import Testing
.paragraph("| not a table"),
])
}
+
+@Test func messagesWithoutClientNoncesHaveDistinctRowAndSeparatorIdentities() {
+ let entries = ["", "", nil].enumerated().map { index, nonce in
+ Entry(id: "incoming-\(index)", seq: Int64(index), botId: "b", rev: Int64(index), kind: "user", turn: 1,
+ data: EntryData(text: "Incoming message \(index)", clientNonce: nonce),
+ createdAt: Int64(index) * 7_200_000, updatedAt: 0)
+ }
+ let items = ChatItem.build(entries)
+ let messageIDs = items.compactMap { item -> String? in
+ if case .entry = item.kind { item.id } else { nil }
+ }
+ #expect(messageIDs == entries.map(\.id))
+ #expect(Set(items.map(\.id)).count == items.count)
+}
+
+@Test func optimisticMessageKeepsItsRowIdentityAfterAcknowledgement() {
+ let data = EntryData(text: "Sent message", clientNonce: "client-nonce")
+ let optimistic = Entry(id: "local-client-nonce", seq: 0, botId: "b", rev: 0, kind: "user", turn: 1,
+ data: data, createdAt: 0, updatedAt: 0)
+ var delivered = optimistic
+ delivered.id = "server-entry"
+ delivered.seq = 10
+ delivered.rev = 11
+ let pendingItems = ChatItem.build([optimistic])
+ let deliveredItems = ChatItem.build([delivered])
+ #expect(pendingItems.map(\.id) == deliveredItems.map(\.id))
+}
diff --git a/apps/ios/Kit/Tests/CodyncUITests/IncomingBotMessageRenderingTests.swift b/apps/ios/Kit/Tests/CodyncUITests/IncomingBotMessageRenderingTests.swift
new file mode 100644
index 00000000..c9017b8e
--- /dev/null
+++ b/apps/ios/Kit/Tests/CodyncUITests/IncomingBotMessageRenderingTests.swift
@@ -0,0 +1,87 @@
+#if os(macOS)
+import AppKit
+import SwiftUI
+import Testing
+import Vision
+@testable import CodyncKit
+@testable import CodyncUI
+
+@MainActor @Test func incomingBotMessagesWithEmptyNoncesRemainVisible() async throws {
+ _ = NSApplication.shared
+ let suite = "IncomingBotMessageTests.\(UUID())"
+ let storage = SharedStore.Context(accountID: suite, suite: suite)
+ defer { storage.erase(); UserDefaults(suiteName: suite)?.removePersistentDomain(forName: suite) }
+ let fake = FakeRemote(.ready(.direct))
+ let store = BotStore(computer: Computer(id: "incoming-fixture", name: "Fixture", signKey: ""),
+ route: .channel, clientKind: "macos", storage: storage) { fake }
+ defer { store.retire() }
+ store.setActive(true)
+ try await waitFor { await fake.subscribed }
+ await fake.emit(botEvent(status: "idle", rev: 1))
+ let oldMarker = "Old incoming message remains visible."
+ await fake.emit(try entryEvent(id: "old-incoming", seq: 1, rev: 2, text: oldMarker + "\n\n" + String(repeating: "An earlier bot submitted this request. ", count: 5), final: false, kind: "user", nonce: ""))
+ await fake.emit(try entryEvent(id: "old-reply", seq: 2, rev: 3, text: "Earlier response before the next incoming alert.", final: true))
+ try await waitFor { store.allEntries("b").count == 2 }
+ let hosting = NSHostingView(rootView: ThreadView(botId: "b")
+ .environment(store))
+ let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 620, height: 1080), styleMask: [.borderless], backing: .buffered, defer: false)
+ window.isReleasedWhenClosed = false
+ window.appearance = NSAppearance(named: .aqua)
+ window.contentView = hosting
+ defer { window.close() }
+ hosting.layoutSubtreeIfNeeded()
+ hosting.displayIfNeeded()
+ try await Task.sleep(for: .milliseconds(600))
+ let newMarker = "New incoming message fills this space."
+ await fake.emit(botEvent(status: "working", rev: 4))
+ await fake.emit(try entryEvent(id: "new-incoming", seq: 3, rev: 5,
+ text: newMarker + "\n\n" + String(repeating: "The latest incoming alert must render between the preceding response and its final reply. ", count: 15),
+ final: false, kind: "user", nonce: ""))
+ try await waitFor { store.allEntries("b").count == 3 }
+ try await Task.sleep(for: .milliseconds(600))
+ await fake.emit(try entryEvent(id: "new-reply", seq: 4, rev: 6, text: "Final response after the incoming alert.", final: true))
+ await fake.emit(botEvent(status: "idle", rev: 7))
+ try await waitFor { store.allEntries("b").count == 4 }
+ try await Task.sleep(for: .seconds(1))
+ hosting.layoutSubtreeIfNeeded()
+ hosting.displayIfNeeded()
+ let bitmap = try #require(hosting.bitmapImageRepForCachingDisplay(in: hosting.bounds))
+ hosting.cacheDisplay(in: hosting.bounds, to: bitmap)
+ let png = try #require(bitmap.representation(using: .png, properties: [:]))
+ let rendered = try await recognizeText(png)
+ #expect(rendered.contains(oldMarker), "Earlier incoming message disappeared: \(rendered)")
+ #expect(rendered.contains(newMarker), "Latest incoming message left a blank space: \(rendered)")
+}
+
+private func botEvent(status: String, rev: Int64) -> String {
+ #"{"type":"bot","bot":{"id":"b","name":"Fixture","status":"\#(status)","rev":\#(rev),"lastAt":1}}"#
+}
+
+private func entryEvent(id: String, seq: Int64, rev: Int64, text: String, final: Bool, kind: String = "agent", nonce: String? = nil) throws -> String {
+ var data = EntryData(text: text, clientNonce: nonce)
+ data.final = final
+ let entry = Entry(id: id, seq: seq, botId: "b", rev: rev, kind: kind, turn: seq,
+ data: data, createdAt: seq, updatedAt: rev)
+ let encoded = try JSONEncoder().encode(entry)
+ return "{\"type\":\"entry\",\"entry\":\(String(decoding: encoded, as: UTF8.self))}"
+}
+
+@MainActor private func waitFor(_ condition: @MainActor () async -> Bool) async throws {
+ for _ in 0..<200 {
+ if await condition() { return }
+ try await Task.sleep(for: .milliseconds(10))
+ }
+ Issue.record("Timed out waiting for the scripted event")
+}
+
+private func recognizeText(_ png: Data) async throws -> String {
+ let task = Task.detached {
+ let request = VNRecognizeTextRequest()
+ request.recognitionLevel = .accurate
+ let handler = VNImageRequestHandler(data: png)
+ try handler.perform([request])
+ return (request.results ?? []).compactMap { $0.topCandidates(1).first?.string }.joined(separator: " ")
+ }
+ return try await task.value
+}
+#endif