Skip to content

fix: message bumpy issue #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sirily11 merged 1 commit into from
May 22, 2026
Merged

fix: message bumpy issue #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 84 additions & 24 deletions Packages/Sources/RxCodeChatKit/MessageListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@ struct MessageListView: View {
@State private var isPinningLatestTurnToTop = false
@State private var canReleasePinnedTurnByScroll = false
@State private var pendingIndicatorSpacerReduction: CGFloat = 0
@State private var activeTurnMaxMeasuredHeight: CGFloat = 0
@State private var lastBottomScrollDate = Date.distantPast

private static let log = Logger(subsystem: "com.claudework", category: "MessageListView")
private static let bottomAnchorID = "message-list-bottom-anchor"
private static let endOfScreenAnchorID = "message-list-end-of-screen"
private static let userScrollDownDelta: CGFloat = 4
private static let streamingIndicatorEstimatedHeight: CGFloat = 36
private static let contentGrowthBottomScrollInterval: TimeInterval = 2
private static let pinToTopAnimationDuration: Duration = .milliseconds(320)
private static let pinToTopAnimationSeconds: Double = 0.32

Expand Down Expand Up @@ -165,7 +168,7 @@ struct MessageListView: View {
.onScrollGeometryChange(for: CGFloat.self) { geo in
geo.contentOffset.y
} action: { oldOffsetY, offsetY in
if isUserDrivenScroll,
if isDirectUserScroll,
isPinningLatestTurnToTop,
canReleasePinnedTurnByScroll,
offsetY > oldOffsetY + Self.userScrollDownDelta
Expand Down Expand Up @@ -195,7 +198,8 @@ struct MessageListView: View {
}
.onChange(of: chatBridge.messages.last?.content) { _, _ in
guard isSessionReady else { return }
if repinActiveTurnIfNeeded(proxy: proxy) { return }
guard !isPinningLatestTurnToTop else { return }
scrollToBottomDebounced(proxy)
}
.onChange(of: isSessionReady) { _, new in
Self.log.info("[MessageList.ready] isSessionReady=\(new) sid=\(windowState.currentSessionId ?? "<nil>", privacy: .public) settled=\(settledItems.count)")
Expand Down Expand Up @@ -225,10 +229,11 @@ struct MessageListView: View {
rebuildSettledItems()
if !isSessionReady { isSessionReady = true }
if let latest = chatBridge.messages.last, latest.role == .user {
activeTurnUserMessageID = latest.id
startActiveTurn(latest.id)
isPinningLatestTurnToTop = true
pendingIndicatorSpacerReduction = Self.streamingIndicatorEstimatedHeight
pinSentMessageToTop(latest.id, proxy: proxy)
updateActiveTurnMaxMeasuredHeight()
pinSentMessageToTop(latest.id, proxy: proxy, animated: true)
} else if repinActiveTurnIfNeeded(proxy: proxy) {
// Keep the mobile-style top pin across the pending-session-id
// to real-session-id swap that can happen after streaming starts.
Expand All @@ -241,13 +246,15 @@ struct MessageListView: View {
}
isSessionReady = false
scrollTask?.cancel()
scrollTask = nil
settleScrollTask?.cancel()
readyTask?.cancel()
pinToTopTask?.cancel()
activeTurnUserMessageID = nil
isPinningLatestTurnToTop = false
canReleasePinnedTurnByScroll = false
pendingIndicatorSpacerReduction = 0
activeTurnMaxMeasuredHeight = 0
rebuildSettledItems()
Self.log.info("[MessageList.task] post-rebuild settled=\(settledItems.count) sid=\(sid, privacy: .public) isLoadingFromDisk=\(chatBridge.isLoadingFromDisk)")
// Empty sessions appear instantly — unless we're still loading persisted
Expand Down Expand Up @@ -299,6 +306,7 @@ struct MessageListView: View {
chatBridge.messages.last?.role == .user
{
pendingIndicatorSpacerReduction = Self.streamingIndicatorEstimatedHeight
updateActiveTurnMaxMeasuredHeight()
if repinActiveTurnIfNeeded(proxy: proxy) { return }
}
// Only react when streaming ends — the settled list doesn't change at start.
Expand Down Expand Up @@ -335,11 +343,12 @@ struct MessageListView: View {
guard let last = chatBridge.messages.last else { return }
logScrollState("lastMessageChange", extra: "lastRole=\(last.role.rawValue) lastID=\(last.id.uuidString)")
if last.role == .user {
activeTurnUserMessageID = last.id
startActiveTurn(last.id)
pendingIndicatorSpacerReduction = chatBridge.isStreaming ? Self.streamingIndicatorEstimatedHeight : 0
updateActiveTurnMaxMeasuredHeight()
isPinningLatestTurnToTop = true
canReleasePinnedTurnByScroll = false
pinSentMessageToTop(last.id, proxy: proxy)
pinSentMessageToTop(last.id, proxy: proxy, animated: true)
return
}
if repinActiveTurnIfNeeded(proxy: proxy) { return }
Expand All @@ -348,12 +357,14 @@ struct MessageListView: View {
private func prepareForNewUserSend() {
logScrollState("prepareForNewUserSend")
scrollTask?.cancel()
scrollTask = nil
settleScrollTask?.cancel()
pinToTopTask?.cancel()
activeTurnUserMessageID = nil
isPinningLatestTurnToTop = false
canReleasePinnedTurnByScroll = false
pendingIndicatorSpacerReduction = 0
activeTurnMaxMeasuredHeight = 0
}

/// If streaming, returns only completed messages excluding the last consecutive (non-error) assistant sequence.
Expand Down Expand Up @@ -386,6 +397,17 @@ struct MessageListView: View {
}
}

/// A stricter check for releasing the mobile-style top pin. Desktop scroll
/// animations can pass through `.decelerating`; treating that as a release
/// makes the programmatic pin immediately bounce back to the bottom.
private var isDirectUserScroll: Bool {
switch scrollPhase {
case .interacting, .tracking: return true
case .idle, .animating, .decelerating: return false
@unknown default: return false
}
}

/// The user message whose geometry drives the active turn spacer.
private var trackedUserMessageID: UUID? {
activeTurnUserMessageID ?? settledItems.last(where: { $0.role == .user })?.id
Expand All @@ -401,8 +423,7 @@ struct MessageListView: View {
private var pinTailSpacerExtraHeight: CGFloat {
guard activeTurnUserMessageID != nil else { return 0 }
guard scrollViewHeight > 0 else { return 0 }
let latestTurnHeight = max(0, tailSpacerMinY - latestUserMinY)
+ pendingIndicatorSpacerReduction
let latestTurnHeight = max(activeTurnMaxMeasuredHeight, rawActiveTurnMeasuredHeight)
return max(0, scrollViewHeight - latestTurnHeight - minTailSpacer)
}

Expand All @@ -411,14 +432,23 @@ struct MessageListView: View {
proxy.scrollTo(Self.bottomAnchorID, anchor: .bottom)
}

/// Debounced scroll-to-bottom for content growth. Re-armed on every geometry
/// change, so a burst of streaming deltas collapses into a single scroll.
/// Coalesced scroll-to-bottom for content growth. Streaming can update the
/// geometry once per token; keep bottom-follow to at most one scroll every
/// couple of seconds so it doesn't fight SwiftUI's lazy layout.
private func scrollToBottomDebounced(_ proxy: ScrollViewProxy) {
scrollTask?.cancel()
guard scrollTask == nil else { return }
logScrollState("scrollToBottom.debounceScheduled")
let elapsed = Date().timeIntervalSince(lastBottomScrollDate)
let delay = max(0, Self.contentGrowthBottomScrollInterval - elapsed)
scrollTask = Task { @MainActor in
try? await Task.sleep(for: .milliseconds(50))
guard !Task.isCancelled, !isUserDrivenScroll else { return }
let delayNanoseconds = UInt64(delay * 1_000_000_000)
if delayNanoseconds > 0 {
try? await Task.sleep(nanoseconds: delayNanoseconds)
}
guard !Task.isCancelled else { return }
scrollTask = nil
Comment on lines +444 to +449
guard !isUserDrivenScroll, !isPinningLatestTurnToTop else { return }
lastBottomScrollDate = Date()
logScrollState("scrollToBottom.debounceFired")
scrollToBottom(proxy)
}
Expand All @@ -445,20 +475,23 @@ struct MessageListView: View {
}

/// Pin a freshly sent user message to the top of the viewport.
private func pinSentMessageToTop(_ id: UUID, proxy: ScrollViewProxy) {
private func pinSentMessageToTop(_ id: UUID, proxy: ScrollViewProxy, animated: Bool) {
scrollTask?.cancel()
scrollTask = nil
settleScrollTask?.cancel()
pinToTopTask?.cancel()
canReleasePinnedTurnByScroll = false
logScrollState("pinTop.scheduled", extra: "target=\(id.uuidString)")
logScrollState("pinTop.scheduled", extra: "target=\(id.uuidString) animated=\(animated)")
pinToTopTask = Task { @MainActor in
try? await Task.sleep(for: .milliseconds(16))
guard !Task.isCancelled else { return }
logScrollState("pinTop.animated", extra: "target=\(id.uuidString)")
withAnimation(.easeInOut(duration: Self.pinToTopAnimationSeconds)) {
proxy.scrollTo(id, anchor: .top)
if animated {
guard !Task.isCancelled else { return }
logScrollState("pinTop.animated", extra: "target=\(id.uuidString)")
withAnimation(.easeInOut(duration: Self.pinToTopAnimationSeconds)) {
proxy.scrollTo(id, anchor: .top)
}
try? await Task.sleep(for: Self.pinToTopAnimationDuration)
}
try? await Task.sleep(for: Self.pinToTopAnimationDuration)
for attempt in 0..<8 {
guard !Task.isCancelled else { return }
if attempt == 0 || attempt == 7 {
Expand All @@ -481,7 +514,7 @@ struct MessageListView: View {
guard isPinningLatestTurnToTop, let id = activeTurnUserMessageID else {
return false
}
pinSentMessageToTop(id, proxy: proxy)
pinSentMessageToTop(id, proxy: proxy, animated: false)
return true
}

Expand All @@ -492,7 +525,10 @@ struct MessageListView: View {
isPinningLatestTurnToTop = false
pendingIndicatorSpacerReduction = 0
anchor.resetToBottom()
scrollToBottomDebounced(proxy)
scrollTask?.cancel()
scrollTask = nil
lastBottomScrollDate = Date()
scrollToBottom(proxy)
}

/// `minY` of the latest user message — fed back from `ChatMessageListView`.
Expand All @@ -501,6 +537,7 @@ struct MessageListView: View {
var transaction = Transaction()
transaction.animation = nil
withTransaction(transaction) { latestUserMinY = value }
updateActiveTurnMaxMeasuredHeight()
logScrollState("latestUserMinY.updated", extra: "value=\(value)")
}

Expand All @@ -517,16 +554,39 @@ struct MessageListView: View {
pendingIndicatorSpacerReduction = 0
}
}
updateActiveTurnMaxMeasuredHeight()
logScrollState("tailSpacerMinY.updated", extra: "value=\(value) old=\(oldValue)")
}

private var rawActiveTurnMeasuredHeight: CGFloat {
max(0, tailSpacerMinY - latestUserMinY) + pendingIndicatorSpacerReduction
}

private func startActiveTurn(_ id: UUID) {
activeTurnUserMessageID = id
activeTurnMaxMeasuredHeight = 0
updateActiveTurnMaxMeasuredHeight()
}

private func updateActiveTurnMaxMeasuredHeight() {
guard activeTurnUserMessageID != nil else { return }
let measured = rawActiveTurnMeasuredHeight
guard measured > activeTurnMaxMeasuredHeight + 0.5 else { return }
var transaction = Transaction()
transaction.animation = nil
withTransaction(transaction) {
activeTurnMaxMeasuredHeight = measured
}
}

private func logScrollState(_ label: String, extra: String = "") {
let active = activeTurnUserMessageID?.uuidString ?? "<nil>"
let latestTurnHeight = max(0, tailSpacerMinY - latestUserMinY) + pendingIndicatorSpacerReduction
let rawTurnHeight = rawActiveTurnMeasuredHeight
let latestTurnHeight = max(activeTurnMaxMeasuredHeight, rawTurnHeight)
let extraSpacer = pinTailSpacerExtraHeight
let suffix = extra.isEmpty ? "" : " \(extra)"
Self.log.info(
"[ScrollPin] \(label, privacy: .public) sid=\(windowState.currentSessionId ?? "<nil>", privacy: .public) active=\(active, privacy: .public) pinning=\(isPinningLatestTurnToTop) releaseArmed=\(canReleasePinnedTurnByScroll) userDriven=\(isUserDrivenScroll) stream=\(chatBridge.isStreaming) scrollH=\(Double(scrollViewHeight), privacy: .public) userY=\(Double(latestUserMinY), privacy: .public) tailY=\(Double(tailSpacerMinY), privacy: .public) turnH=\(Double(latestTurnHeight), privacy: .public) minTail=\(Double(minTailSpacer), privacy: .public) extraSpacer=\(Double(extraSpacer), privacy: .public) pendingReduce=\(Double(pendingIndicatorSpacerReduction), privacy: .public)\(suffix, privacy: .public)"
"[ScrollPin] \(label, privacy: .public) sid=\(windowState.currentSessionId ?? "<nil>", privacy: .public) active=\(active, privacy: .public) pinning=\(isPinningLatestTurnToTop) releaseArmed=\(canReleasePinnedTurnByScroll) userDriven=\(isUserDrivenScroll) directUser=\(isDirectUserScroll) stream=\(chatBridge.isStreaming) scrollH=\(Double(scrollViewHeight), privacy: .public) userY=\(Double(latestUserMinY), privacy: .public) tailY=\(Double(tailSpacerMinY), privacy: .public) rawTurnH=\(Double(rawTurnHeight), privacy: .public) turnH=\(Double(latestTurnHeight), privacy: .public) minTail=\(Double(minTailSpacer), privacy: .public) extraSpacer=\(Double(extraSpacer), privacy: .public) pendingReduce=\(Double(pendingIndicatorSpacerReduction), privacy: .public)\(suffix, privacy: .public)"
)
}
}
Expand Down
18 changes: 10 additions & 8 deletions RxCodeMobile/Views/MobileChatView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
isEstablishingInitialScroll = false
didEstablishInitialScroll = true
isInitialMessageListHidden = false
pinSentMessageToTop(last.id, proxy: proxy)
pinSentMessageToTop(last.id, proxy: proxy, animated: true)
} else if !didEstablishInitialScroll {
// First page of messages arrived after the view
// appeared — jump straight to the newest one.
Expand Down Expand Up @@ -937,19 +937,21 @@
}

/// Pin a freshly sent user message to the top of the viewport.
private func pinSentMessageToTop(_ id: UUID, proxy: ScrollViewProxy) {
private func pinSentMessageToTop(_ id: UUID, proxy: ScrollViewProxy, animated: Bool) {
pinToTopTask?.cancel()
canReleasePinnedTurnByScroll = false
pinToTopTask = Task { @MainActor in
// Give SwiftUI one frame to realize the new row, then keep
// asserting the pin while the tracked-row geometry, tail spacer,
// streaming indicator, and keyboard layout settle.
try? await Task.sleep(for: .milliseconds(16))
guard !Task.isCancelled else { return }
withAnimation(.easeInOut(duration: Self.pinToTopAnimationSeconds)) {
proxy.scrollTo(id, anchor: .top)
if animated {
guard !Task.isCancelled else { return }
withAnimation(.easeInOut(duration: Self.pinToTopAnimationSeconds)) {
proxy.scrollTo(id, anchor: .top)
}
try? await Task.sleep(for: Self.pinToTopAnimationDuration)
}
try? await Task.sleep(for: Self.pinToTopAnimationDuration)
for _ in 0 ..< 8 {
guard !Task.isCancelled else { return }
var transaction = Transaction()
Expand All @@ -971,7 +973,7 @@
) {
guard didEstablishInitialScroll, abs(newValue - oldValue) > 0.5 else { return }
if isPinningLatestTurnToTop, let id = activeTurnUserMessageID ?? trackedUserMessageID {
pinSentMessageToTop(id, proxy: proxy)
pinSentMessageToTop(id, proxy: proxy, animated: false)
} else if autoScrollEnabled {
scrollToBottomAfterLayout(proxy: proxy)
}
Expand All @@ -981,7 +983,7 @@
guard isPinningLatestTurnToTop, let id = activeTurnUserMessageID else {
return false
}
pinSentMessageToTop(id, proxy: proxy)
pinSentMessageToTop(id, proxy: proxy, animated: false)
return true
}

Expand Down Expand Up @@ -1201,4 +1203,4 @@
let count = pendingPlans.count
return count == 1 ? "Plan ready to review" : "\(count) plans ready to review"
}
}

Check warning on line 1206 in RxCodeMobile/Views/MobileChatView.swift

View workflow job for this annotation

GitHub Actions / swiftlint 

File should contain 800 lines or less excluding comments and whitespaces: currently contains 970 (file_length)
Loading