Skip to content

T1a: Preserve keyed timeline segments during reconciliation #40

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
VolkerChristian merged 1 commit into from
Aug 22, 2026
+397 −86
Merged

T1a: Preserve keyed timeline segments during reconciliation #40

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
153 changes: 67 additions & 86 deletions src/ui/ConversationWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3092,6 +3092,8 @@ void ConversationWidget::render(const sdk::State& state,
renderedSegmentItemIds.clear();
renderedSegmentKeys.clear();
renderedSegmentWidgets.clear();
renderedActivityRows.clear();
renderedActivityRowSegments.clear();
clearLayout(timeline);
};

Expand Down Expand Up @@ -3261,14 +3263,37 @@ void ConversationWidget::render(const sdk::State& state,
for (const VisibleTimelineTurn& visibleTurn : visibleTurns)
visibleTurnIds.append(fromUtf8(visibleTurn.turn->id.value));

const auto removeRenderedTurn = [this, &timelineShrank, &timelineGeometryChanged](const QString& turnId)
const auto forgetRenderedActivityRows = [this](const QString& storage)
{
for (auto row = renderedActivityRowSegments.begin();
row != renderedActivityRowSegments.end();)
{
if (row.value() != storage)
{
++row;
continue;
}
renderedActivityRows.remove(row.key());
row = renderedActivityRowSegments.erase(row);
}
};
const auto forgetRenderedSegment =
[this, &forgetRenderedActivityRows](const QString& storage)
{
forgetRenderedActivityRows(storage);
renderedSegmentItemIds.remove(storage);
renderedSegmentKeys.remove(storage);
renderedSegmentWidgets.remove(storage);
};
const auto removeRenderedTurn = [this,
&forgetRenderedSegment,
&timelineShrank,
&timelineGeometryChanged](const QString& turnId)
{
for (const QString& segmentId : renderedSegmentIds.take(turnId))
{
const QString storage = segmentStorageKey(turnId, segmentId);
renderedSegmentItemIds.remove(storage);
renderedSegmentKeys.remove(storage);
renderedSegmentWidgets.remove(storage);
forgetRenderedSegment(storage);
}
renderedTurnLabels.remove(turnId);
renderedTurnStatusLabels.remove(turnId);
Expand Down Expand Up @@ -3384,90 +3409,34 @@ void ConversationWidget::render(const sdk::State& state,
segmentIds.append(segment->id);

const QStringList oldSegmentIds = renderedSegmentIds.value(turnId);
bool compatibleSegments = true;
qsizetype removedSegmentPrefix = 0;
if (!oldSegmentIds.isEmpty())
const QSet<QString> nextSegmentIds(
segmentIds.cbegin(), segmentIds.cend());
for (const QString& oldId : oldSegmentIds)
{
if (segmentIds.isEmpty())
{
compatibleSegments = false;
}
else
{
removedSegmentPrefix = oldSegmentIds.indexOf(segmentIds.front());
compatibleSegments = removedSegmentPrefix >= 0
&& oldSegmentIds.size() - removedSegmentPrefix <= segmentIds.size();
for (qsizetype segmentIndex = 0;
compatibleSegments && segmentIndex < oldSegmentIds.size() - removedSegmentPrefix;
++segmentIndex)
{
const QString oldId = oldSegmentIds.at(removedSegmentPrefix + segmentIndex);
const QString storage = segmentStorageKey(turnId, oldId);
compatibleSegments = oldId == segmentIds.at(segmentIndex)
&& renderedSegmentWidgets.contains(storage);
}
}
}
if (!compatibleSegments)
{
if (QWidget* turnWidget = renderedTurnWidgets.value(turnId);
pendingViewportAnchor && turnWidget
&& (pendingViewportAnchor == turnWidget
|| turnWidget->isAncestorOf(pendingViewportAnchor)))
pendingViewportAnchor.clear();
clearLayout(itemLayout);
timelineShrank = timelineShrank || !oldSegmentIds.isEmpty();
for (const QString& oldId : oldSegmentIds)
{
const QString storage = segmentStorageKey(turnId, oldId);
renderedSegmentItemIds.remove(storage);
renderedSegmentKeys.remove(storage);
renderedSegmentWidgets.remove(storage);
}
}
else
{
if (removedSegmentPrefix > 0 && pendingViewportAnchor)
{
bool anchorRemoved = false;
for (qsizetype segmentIndex = 0; segmentIndex < removedSegmentPrefix; ++segmentIndex)
{
QWidget* removed = renderedSegmentWidgets.value(
segmentStorageKey(turnId, oldSegmentIds.at(segmentIndex)));
anchorRemoved = anchorRemoved || pendingViewportAnchor == removed
|| (removed && removed->isAncestorOf(pendingViewportAnchor));
}
if (anchorRemoved && removedSegmentPrefix < oldSegmentIds.size())
{
QWidget* survivor = renderedSegmentWidgets.value(
segmentStorageKey(turnId, oldSegmentIds.at(removedSegmentPrefix)));
pendingViewportAnchor = survivor;
if (survivor)
{
pendingViewportAnchorY = scrollArea->viewport()
->mapFromGlobal(survivor->mapToGlobal(QPoint{}))
.y();
}
}
}
for (qsizetype segmentIndex = 0; segmentIndex < removedSegmentPrefix; ++segmentIndex)
if (nextSegmentIds.contains(oldId))
continue;
const QString storage = segmentStorageKey(turnId, oldId);
if (QWidget* widget = renderedSegmentWidgets.value(storage))
{
const QString storage = segmentStorageKey(turnId, oldSegmentIds.at(segmentIndex));
if (QWidget* widget = renderedSegmentWidgets.take(storage))
{
itemLayout->removeWidget(widget);
widget->hide();
widget->deleteLater();
timelineShrank = true;
timelineGeometryChanged = true;
}
renderedSegmentKeys.remove(storage);
renderedSegmentItemIds.remove(storage);
if (pendingViewportAnchor == widget
|| (pendingViewportAnchor
&& widget->isAncestorOf(pendingViewportAnchor)))
pendingViewportAnchor.clear();
itemLayout->removeWidget(widget);
widget->hide();
widget->deleteLater();
timelineShrank = true;
timelineGeometryChanged = true;
}
forgetRenderedSegment(storage);
}

for (const TimelineSegment* segment : visibleTurn.segments)
for (qsizetype segmentIndex = 0;
segmentIndex < static_cast<qsizetype>(visibleTurn.segments.size());
++segmentIndex)
{
const TimelineSegment* segment = visibleTurn.segments.at(
static_cast<std::size_t>(segmentIndex));
const QString storage = segmentStorageKey(turnId, segment->id);
QStringList itemIds;
itemIds.reserve(static_cast<qsizetype>(segment->items.size()));
Expand All @@ -3478,6 +3447,16 @@ void ConversationWidget::render(const sdk::State& state,
}
renderedSegmentItemIds.insert(storage, std::move(itemIds));
QWidget* oldWidget = renderedSegmentWidgets.value(storage);
if (oldWidget)
oldWidget->setProperty(
"timelineItemCount", timelineItemCount(*segment));
if (oldWidget && itemLayout->indexOf(oldWidget) != segmentIndex)
{
itemLayout->removeWidget(oldWidget);
itemLayout->insertWidget(
segmentIndex, oldWidget, 0, Qt::AlignTop);
timelineGeometryChanged = true;
}
const ConversationContentUpdates* segmentContentChanges = nullptr;
ConversationContentUpdates segmentContentStorage;
bool explicitlyAffected = false;
Expand Down Expand Up @@ -3564,19 +3543,21 @@ void ConversationWidget::render(const sdk::State& state,
const bool replacesAnchor = pendingViewportAnchor == oldWidget
|| (pendingViewportAnchor
&& oldWidget->isAncestorOf(pendingViewportAnchor));
const int position = itemLayout->indexOf(oldWidget);
itemLayout->removeWidget(oldWidget);
oldWidget->hide();
oldWidget->deleteLater();
itemLayout->insertWidget(position, newWidget, 0, Qt::AlignTop);
forgetRenderedActivityRows(storage);
itemLayout->insertWidget(
segmentIndex, newWidget, 0, Qt::AlignTop);
if (replacesAnchor)
pendingViewportAnchor = newWidget;
pendingViewportAnchor.clear();
timelineShrank = true;
timelineGeometryChanged = true;
}
else
{
itemLayout->addWidget(newWidget, 0, Qt::AlignTop);
itemLayout->insertWidget(
segmentIndex, newWidget, 0, Qt::AlignTop);
timelineGeometryChanged = true;
}
renderedSegmentWidgets.insert(storage, newWidget);
Expand Down
3 changes: 3 additions & 0 deletions src/ui/ConversationWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ namespace codexui {
class AnchoredTurnSurface;
class UpcomingTurnDock;
struct UpcomingTurnDraft;
struct ConversationWidgetTestAccess;

struct ConversationContentAppend
{
Expand Down Expand Up @@ -104,6 +105,8 @@ class ConversationWidget : public QWidget
void resizeEvent(QResizeEvent* event) override;

private:
friend struct ConversationWidgetTestAccess;

void scheduleTimelineLayout(int previousScroll,
bool followLatest,
bool threadChanged,
Expand Down
Loading