Fix video review comments in threads#1056
Merged
Merged
Conversation
wpfleger96
approved these changes
Jun 15, 2026
…ad-modal # Conflicts: # desktop/src/features/messages/ui/MessageThreadPanel.tsx
wpfleger96
added a commit
that referenced
this pull request
Jun 15, 2026
PR 1008's Option C hierarchical read-state + Phase A frontier snapshot + currentPubkey self-skip collided with #1056's buildThreadPanelIndex/buildThreadPanelDataFromIndex split on the threading-core files. Re-applied the read-state hooks onto main's refactored index API rather than reverting either side; both features' tests pass. Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
tellaho
added a commit
that referenced
this pull request
Jun 15, 2026
Semantic merge converging on main's shared-walk architecture while preserving this PR's unique freeze fix. - threadPanel.ts: adopt main's ThreadPanelIndex / buildThreadPanelIndex / buildThreadPanelDataFromIndex as the canonical shared descendant-walk. Dropped our superseded precomputedDescendantStatsByMessageId optional param (A.3.1 plumbing). Kept the normalizeInlineReplyMessage WeakMap reply-memo cache fully intact — the load-bearing deep-thread freeze fix, untouched by #1056. - ChannelScreen.tsx, TimelineMessageList.tsx: re-homed our wiring onto main's rewritten shapes; preserved #1056's video-review thread logic. - threadPanel.test.mjs: kept both WeakMap regression tests and main's index test; dropped our A.3.1 walk-once test (exercised the removed precomputed param + 2-arg buildMainTimelineEntries; its intent is now structurally guaranteed by ThreadPanelIndex + main's index test). - relay-connectivity-screenshots.spec.ts: converged on main's settle() Promise.allSettled idiom (carried earlier via #1041/#1002). Brings #1041 (Polish huddles UI) and #1056 (Fix video review comments in threads) into ancestry. Gate green: pnpm check 0, pnpm test 746/746. Co-authored-by: Taylor Ho <taylorkmho@gmail.com> Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
michaelneale
added a commit
that referenced
this pull request
Jun 16, 2026
* main: (128 commits) perf(timeline): gate heavy message render behind useDeferredValue (#1022) Add animated profile avatars (#1031) Polish direct message and members modals (#1054) Polish huddles UI (#1041) Fix video review comments in threads (#1056) Polish message reaction tray (#1002) Refine app loading skeletons (#1001) Polish channel modal forms (#1000) Normalize desktop icon sizing (#999) Add shared skeleton loader primitives (#998) chore(scripts): update post-screenshots repo name to block/buzz (#1042) docs: fix stale sprout repo references in RELEASING.md (#1043) chore(release): release version 0.3.23 (#1040) fix(release): publish manifest from successful platforms (#1039) chore(release): release version 0.3.22 (#1038) chore(release): release version 0.3.21 (#1037) fix(release): use signed NSIS installer for updates (#1036) handoff: pass full session history to summarizer (#1033) feat(emoji): latest-set-wins union for custom emoji across desktop, mobile, and CLI (#989) Fix relay NIP-11 software URL (#1030) ... # Conflicts: # Cargo.lock # crates/buzz-acp/src/config.rs # crates/buzz-acp/src/relay.rs # crates/buzz-acp/src/serverless_relay.rs # crates/buzz-cli/src/client.rs # crates/buzz-cli/src/commands/channels.rs # crates/buzz-cli/src/commands/mem.rs # crates/buzz-cli/src/lib.rs # desktop/scripts/check-file-sizes.mjs # desktop/src-tauri/Cargo.lock # desktop/src-tauri/src/commands/messages.rs # desktop/src-tauri/src/commands/mod.rs # desktop/src-tauri/src/events.rs # desktop/src-tauri/src/lib.rs # desktop/src-tauri/src/managed_agents/runtime.rs # desktop/src-tauri/src/relay.rs # desktop/src/app/AppShell.tsx # desktop/src/app/AppTopChrome.tsx # desktop/src/features/messages/hooks.ts # desktop/src/features/sidebar/ui/AppSidebar.tsx # desktop/src/features/workspaces/ui/AddWorkspaceDialog.tsx # desktop/src/features/workspaces/ui/WelcomeSetup.tsx # desktop/src/features/workspaces/workspaceStorage.ts # desktop/src/shared/api/tauri.ts # justfile
wpfleger96
added a commit
that referenced
this pull request
Jun 16, 2026
Reconcile the reply-surfacing render path with main's unread-indicator (#1008), day-group refactor (#1056), and settle() hardening (#1022). TimelineMessageList now walks the surfaced-reply rows array while layering main's UnreadDivider and buildDayGroupBoundaries day-grouping on top; the relay spec keeps the race+timeout settle() guard (strict superset of main's allSettled, which cannot bound a never-settling animation). Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
wpfleger96
pushed a commit
that referenced
this pull request
Jun 16, 2026
* origin/main: (50 commits) chore(release): release version 0.3.24 (#1074) feat(desktop): refine thread-unread badge to two-token form (#1069) fix(buzz): prevent reconnect storms from reaped ephemeral channels (#1071) fix(buzz-acp): trim oversized observer frames to fit instead of dropping (#1072) perf(ci): speed up PR CI wall clock and local dev builds (#1028) chore(deps): update react monorepo (#1048) Polish desktop visual details (#1067) ci: use running postgres for pgschema desired-state planning (#1070) fix(desktop): anchor active-turn badge to skew-corrected agent start (#1068) feat(desktop): add configurable transport reconnect hook (#1059) Add automatic database migrations (#988) Add composer spoiler formatting (#1055) feat(desktop): in-channel and in-thread unread indicators (#1008) perf(timeline): gate heavy message render behind useDeferredValue (#1022) Add animated profile avatars (#1031) Polish direct message and members modals (#1054) Polish huddles UI (#1041) Fix video review comments in threads (#1056) Polish message reaction tray (#1002) Refine app loading skeletons (#1001) ... Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com> # Conflicts: # desktop/src-tauri/Cargo.lock
wpfleger96
added a commit
that referenced
this pull request
Jun 16, 2026
…fleger/persona-instantiation * origin/wpfleger/persona-events: (50 commits) chore(release): release version 0.3.24 (#1074) feat(desktop): refine thread-unread badge to two-token form (#1069) fix(buzz): prevent reconnect storms from reaped ephemeral channels (#1071) fix(buzz-acp): trim oversized observer frames to fit instead of dropping (#1072) perf(ci): speed up PR CI wall clock and local dev builds (#1028) chore(deps): update react monorepo (#1048) Polish desktop visual details (#1067) ci: use running postgres for pgschema desired-state planning (#1070) fix(desktop): anchor active-turn badge to skew-corrected agent start (#1068) feat(desktop): add configurable transport reconnect hook (#1059) Add automatic database migrations (#988) Add composer spoiler formatting (#1055) feat(desktop): in-channel and in-thread unread indicators (#1008) perf(timeline): gate heavy message render behind useDeferredValue (#1022) Add animated profile avatars (#1031) Polish direct message and members modals (#1054) Polish huddles UI (#1041) Fix video review comments in threads (#1056) Polish message reaction tray (#1002) Refine app loading skeletons (#1001) ... Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
tellaho
added a commit
that referenced
this pull request
Jun 17, 2026
* origin/main: (26 commits) fix(desktop): restore timeline zoom via rem tokens + chat-as-base type scale (#1052) fix(release): format changelog as linked markdown bullets (#1075) chore(release): release version 0.3.24 (#1074) feat(desktop): refine thread-unread badge to two-token form (#1069) fix(buzz): prevent reconnect storms from reaped ephemeral channels (#1071) fix(buzz-acp): trim oversized observer frames to fit instead of dropping (#1072) perf(ci): speed up PR CI wall clock and local dev builds (#1028) chore(deps): update react monorepo (#1048) Polish desktop visual details (#1067) ci: use running postgres for pgschema desired-state planning (#1070) fix(desktop): anchor active-turn badge to skew-corrected agent start (#1068) feat(desktop): add configurable transport reconnect hook (#1059) Add automatic database migrations (#988) Add composer spoiler formatting (#1055) feat(desktop): in-channel and in-thread unread indicators (#1008) perf(timeline): gate heavy message render behind useDeferredValue (#1022) Add animated profile avatars (#1031) Polish direct message and members modals (#1054) Polish huddles UI (#1041) Fix video review comments in threads (#1056) ... Co-authored-by: Taylor Ho <taylorkmho@gmail.com> Signed-off-by: Taylor Ho <taylorkmho@gmail.com> # Conflicts: # desktop/src/features/messages/lib/useRichTextEditor.ts # desktop/src/features/messages/ui/MessageComposer.tsx
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.
Summary
Validation
pnpm exec biome check ...on touched filespnpm typecheckpnpm testpnpm build && pnpm exec playwright test tests/e2e/video-attachment.spec.ts --project=smokepnpm check