Skip to content

fix(client-runtime): exclude retracted messages from paginated views #64

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
asfires merged 1 commit into from
Sep 4, 2026
Merged

fix(client-runtime): exclude retracted messages from paginated views #64

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
75 changes: 75 additions & 0 deletions packages/client-runtime/src/state/threadReducer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,81 @@ describe("applyThreadDetailEvent", () => {
]);
}
});

it("excludes the retracted message from a paginated thread window", () => {
const paginatedThread: OrchestrationThread = {
...baseThread,
messages: [
{
id: MessageId.make("msg-user-loaded"),
role: "user",
text: "Loaded history",
turnId: null,
streaming: false,
createdAt: "2026-04-01T01:00:00.000Z",
updatedAt: "2026-04-01T01:00:00.000Z",
},
{
id: MessageId.make("msg-assistant-loaded"),
role: "assistant",
text: "Loaded response",
turnId: TurnId.make("turn-287"),
streaming: false,
createdAt: "2026-04-01T02:00:00.000Z",
updatedAt: "2026-04-01T02:00:00.000Z",
},
{
id: MessageId.make("msg-user-retracted"),
role: "user",
text: "Retract me",
turnId: null,
streaming: false,
createdAt: "2026-04-01T03:00:00.000Z",
updatedAt: "2026-04-01T03:00:00.000Z",
},
],
checkpoints: [
{
turnId: TurnId.make("turn-287"),
checkpointTurnCount: 287,
checkpointRef: CheckpointRef.make("ref-287"),
status: "ready",
files: [],
assistantMessageId: MessageId.make("msg-assistant-loaded"),
completedAt: "2026-04-01T02:00:00.000Z",
},
],
};
const completedAt = "2026-04-01T04:00:00.000Z";

const result = applyThreadDetailEvent(paginatedThread, {
...baseEventFields,
sequence: 16,
occurredAt: completedAt,
aggregateKind: "thread",
aggregateId: ThreadId.make("thread-1"),
type: "thread.reverted",
payload: {
threadId: ThreadId.make("thread-1"),
turnCount: 287,
retraction: {
requestId: CommandId.make("cmd-retract-paginated"),
messageId: MessageId.make("msg-user-retracted"),
turnId: null,
firstUserMessage: false,
completedAt,
},
},
});

expect(result.kind).toBe("updated");
if (result.kind === "updated") {
expect(result.thread.messages.map((message) => message.id)).toEqual([
"msg-user-loaded",
"msg-assistant-loaded",
]);
}
});
});

describe("retraction projection", () => {
Expand Down
11 changes: 11 additions & 0 deletions packages/client-runtime/src/state/threadReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,15 @@ export function applyThreadDetailEvent(
);

const retainedTurnIds = new Set(Arr.map(checkpoints, (entry) => entry.turnId));
const excludedMessageIds =
event.payload.retraction === undefined
? new Set<string>()
: new Set([event.payload.retraction.messageId]);
const messages = retainMessagesAfterRevert(
thread.messages,
retainedTurnIds,
event.payload.turnCount,
excludedMessageIds,
);
const proposedPlans = pipe(
thread.proposedPlans,
Expand Down Expand Up @@ -754,9 +759,13 @@ function retainMessagesAfterRevert(
messages: ReadonlyArray<OrchestrationMessage>,
retainedTurnIds: ReadonlySet<string>,
turnCount: number,
excludedMessageIds: ReadonlySet<string>,
): OrchestrationMessage[] {
const retainedMessageIds = new Set<string>();
for (const message of messages) {
if (excludedMessageIds.has(message.id)) {
continue;
}
if (message.role === "system") {
retainedMessageIds.add(message.id);
continue;
Expand All @@ -774,6 +783,7 @@ function retainMessagesAfterRevert(
.filter(
(message) =>
message.role === "user" &&
!excludedMessageIds.has(message.id) &&
!retainedMessageIds.has(message.id) &&
(message.turnId === null || retainedTurnIds.has(message.turnId)),
)
Expand All @@ -794,6 +804,7 @@ function retainMessagesAfterRevert(
.filter(
(message) =>
message.role === "assistant" &&
!excludedMessageIds.has(message.id) &&
!retainedMessageIds.has(message.id) &&
(message.turnId === null || retainedTurnIds.has(message.turnId)),
)
Expand Down
Loading