Skip to content

fix: sort child chats newest-first and prepend on creation #24524

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
mafredri merged 1 commit into from
Apr 20, 2026
Merged

fix: sort child chats newest-first and prepend on creation #24524

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
4 changes: 2 additions & 2 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions coderd/database/queries/chats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ WHERE
ELSE chats.archived = sqlc.narg('archived') :: boolean
END
ORDER BY
chats.created_at ASC,
chats.id ASC;
chats.created_at DESC,
chats.id DESC;

-- name: InsertChat :one
INSERT INTO chats (
Expand Down
6 changes: 3 additions & 3 deletions coderd/exp_chats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,10 +1333,10 @@ func TestListChats(t *testing.T) {
}
require.Len(t, parent.Children, 2, "parent should embed 2 children")

// Children should be ordered by created_at ASC.
// Children are ordered by created_at DESC (newest first).
childIDs := []uuid.UUID{parent.Children[0].ID, parent.Children[1].ID}
require.Equal(t, child1.ID, childIDs[0])
require.Equal(t, child2.ID, childIDs[1])
require.Equal(t, child2.ID, childIDs[0])
require.Equal(t, child1.ID, childIDs[1])

// Verify each child has correct parent/root references.
for _, child := range parent.Children {
Expand Down
12 changes: 6 additions & 6 deletions site/src/api/queries/chats.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { API } from "#/api/api";
import type * as TypesGen from "#/api/typesGenerated";
import { buildOptimisticEditedMessage } from "./chatMessageEdits";
import {
appendChildToParentInCache,
addChildToParentInCache,
archiveChat,
cancelChatListRefetches,
chatCostSummary,
Expand Down Expand Up @@ -1703,8 +1703,8 @@ describe("mutation onMutate cancels pagination fetches", () => {
});
});

describe("appendChildToParentInCache", () => {
it("appends the child to the matching parent's children array", () => {
describe("addChildToParentInCache", () => {
it("prepends new child to the parent's children array", () => {
const queryClient = createTestQueryClient();
const parent = makeChat("parent-1");
seedInfiniteChats(queryClient, [parent]);
Expand All @@ -1713,7 +1713,7 @@ describe("appendChildToParentInCache", () => {
parent_chat_id: "parent-1",
root_chat_id: "parent-1",
});
appendChildToParentInCache(queryClient, child, "parent-1");
addChildToParentInCache(queryClient, child, "parent-1");

const result = readInfiniteChats(queryClient);
expect(result).toHaveLength(1);
Expand All @@ -1730,7 +1730,7 @@ describe("appendChildToParentInCache", () => {
parent_chat_id: "missing-parent",
root_chat_id: "missing-parent",
});
appendChildToParentInCache(queryClient, child, "missing-parent");
addChildToParentInCache(queryClient, child, "missing-parent");

const result = readInfiniteChats(queryClient);
expect(result).toHaveLength(1);
Expand All @@ -1747,7 +1747,7 @@ describe("appendChildToParentInCache", () => {
const parent = makeChat("parent-1", { children: [existingChild] });
seedInfiniteChats(queryClient, [parent]);

appendChildToParentInCache(queryClient, existingChild, "parent-1");
addChildToParentInCache(queryClient, existingChild, "parent-1");

const result = readInfiniteChats(queryClient);
expect(result?.[0].children).toHaveLength(1);
Expand Down
6 changes: 3 additions & 3 deletions site/src/api/queries/chats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ export const readInfiniteChatsCache = (
};

/**
* Appends a child chat to its parent's `children` array across all
* Adds a child chat to its parent's `children` array across all
* infinite chat query caches. If the parent is not in any loaded page,
* the child is silently dropped (it will appear when the parent loads).
*/
export const appendChildToParentInCache = (
export const addChildToParentInCache = (
queryClient: QueryClient,
child: TypesGen.Chat,
parentId: string,
Expand All @@ -119,7 +119,7 @@ export const appendChildToParentInCache = (
// Avoid duplicates.
if (c.children?.some((ch) => ch.id === child.id)) return c;
changed = true;
return { ...c, children: [...(c.children ?? []), child] };
return { ...c, children: [child, ...(c.children ?? [])] };
});
return changed ? next : chats;
});
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/AgentsPage/AgentsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { toast } from "sonner";
import { API, watchChats } from "#/api/api";
import { getErrorMessage } from "#/api/errors";
import {
appendChildToParentInCache,
addChildToParentInCache,
archiveChat,
cancelChatListRefetches,
chatDiffContentsKey,
Expand Down Expand Up @@ -567,10 +567,10 @@ const AgentsPage: FC = () => {
// chat into every loaded page.
if (chatEvent.kind === "created") {
if (updatedChat.parent_chat_id) {
// Child chat: append to its parent's children
// Child chat: add to its parent's children
// array. If the parent is not in any loaded
// page, the child is silently dropped.
appendChildToParentInCache(
addChildToParentInCache(
queryClient,
updatedChat,
updatedChat.parent_chat_id,
Expand Down
Loading