fix: keep activity group keys unique when Claude reuses tool call ids - #226
Merged
Conversation
Claude Code reuses tool_use call ids (toolu_...) across retries, so two
distinct activity runs can both begin with a part of the same id. The
group key was 'activity:${first part id}' which then collided inside
LazyColumn, crashing with IllegalArgumentException. Tag repeat groups
with an occurrence suffix while keeping the bare id for the first run,
so a growing run's identity stays stable as its steps stream in.
Contributor
|
🔍 OpenCodeReview found 1 issue(s) in this PR.
|
Comment on lines
91
to
99
| fun flush() { | ||
| if (pending.isEmpty()) return | ||
| entries += TimelineEntry.Activity("activity:${pending.first().id}", pending.toList()) | ||
| val firstId = pending.first().id | ||
| val occurrence = firstIdOccurrences[firstId] ?: 0 | ||
| firstIdOccurrences[firstId] = occurrence + 1 | ||
| val id = if (occurrence == 0) "activity:$firstId" else "activity:$firstId:$occurrence" | ||
| entries += TimelineEntry.Activity(id, pending.toList()) | ||
| pending.clear() | ||
| } |
Contributor
There was a problem hiding this comment.
[bug · high]
詳細シート(findActivityParts)の再解決が、この suffix schemeで壊れます。"activity:toolu_stream:1" は生成時のカウントで決まるため、messages が 1 つ進むたびにオフセットがずれて(1)既に開いているシートが別のグループの内容に置き換わる/(2)該当 id が見つからずシートが急に閉じる、という事象が起こります。これはコメントで主張している「growing run's identity stays stable」と矛盾します。
「連続で登場する index」ではなく「グループが満たす条件そのもの」で id を決める(例: 同一 firstId の連続出現をまとめ、suffix を覆居的な順序としない、または findActivityParts で suffix から n 番目の出現を解決する)方法に変えることを検討してください。少なくとも、_findActivityParts が開いている sheet の id を安定的に再解決できること_を保証する必要があります。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
概要
Claude Code はリトライ時に tool_use の call id(
toolu_...)を再利用するため、別々の activity グループが同じ先頭パーツ ID を持つことがあります。これが LazyColumn のキー(activity:${first part id})として衝突し、下記のクラッシュが発生していました。修正内容
groupConversationTimelineで、同じ先頭パーツ ID で始まるグループが何回目かをカウントし、2回目以降はactivity:<id>:<n>というサフィックス付きキーにします。1回目は従来どおり bare id を維持するため、成長中のラン(ストリーミング中)の ID は安定したままです。テスト
toolu_ID で始まる複数グループでもキーが一意になることを検証