Skip to content

Commit a044f0c

Browse files
fix(mobile): a final answer followed by more work in the same run stays visible (#36116)
1 parent ed7e501 commit a044f0c

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

‎apps/mobile/src/lib/threadActivity.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,6 +1497,16 @@ describe("buildThreadFeed", () => {
14971497
phase === "final_answer",
14981498
);
14991499
}
1500+
const confirmed = { ...answer, phase: "final_answer" as const };
1501+
const continued = buildThreadFeed(
1502+
[user, confirmed, passed, final].map((item, index) => projected(item, index)),
1503+
);
1504+
expect(
1505+
deriveThreadFeedPresentation(continued, null, new Set()).some(
1506+
(row) => row.type === "message" && row.message.id === answer.messageId,
1507+
),
1508+
).toBe(true);
1509+
expect(rows([user, confirmed, passed, final], "zen")).toEqual(["user", "answer", "final"]);
15001510
expect(rows([user, steer, step, passed, final], "zen")).toEqual(["user", "steer", "final"]);
15011511
expect(rows([user, steer, answer, step], "zen", running)).toEqual([
15021512
"user",

‎apps/mobile/src/lib/threadActivity.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,21 +1103,17 @@ function feedEntryFoldRunId(entry: ThreadFeedEntry, runlessKey: RunId | null): R
11031103
: null;
11041104
}
11051105

1106-
function answersBeforeSteers(feed: ReadonlyArray<ThreadFeedEntry>): ReadonlySet<MessageId> {
1106+
function finalAnswerIds(feed: ReadonlyArray<ThreadFeedEntry>): ReadonlySet<MessageId> {
11071107
const ids = new Set<MessageId>();
1108-
let previous: ThreadFeedEntry | undefined;
11091108
for (const entry of feed) {
11101109
if (
11111110
entry.type === "message" &&
1112-
isSteerMessage(entry.message) &&
1113-
previous?.type === "message" &&
1114-
previous.message.role === "assistant" &&
1115-
previous.message.projectedItem?.item.type === "assistant_message" &&
1116-
previous.message.projectedItem.item.phase === "final_answer"
1111+
entry.message.role === "assistant" &&
1112+
entry.message.projectedItem?.item.type === "assistant_message" &&
1113+
entry.message.projectedItem.item.phase === "final_answer"
11171114
) {
1118-
ids.add(previous.message.id);
1115+
ids.add(entry.message.id);
11191116
}
1120-
previous = entry;
11211117
}
11221118
return ids;
11231119
}
@@ -1129,7 +1125,7 @@ function deriveThreadFeedRunFolds(
11291125
feedFailedRunIds: ReadonlySet<RunId>,
11301126
): ReadonlyMap<string, ThreadFeedRunFold> {
11311127
const terminalAssistantMessageIdByRun = new Map<RunId, string>();
1132-
const retainedAnswerIds = answersBeforeSteers(feed);
1128+
const retainedAnswerIds = finalAnswerIds(feed);
11331129
const interruptedRunIds = new Set<RunId>();
11341130
const failedRunIds = new Set(feedFailedRunIds);
11351131
const promptIndexByRunId = new Map<RunId, number>();
@@ -1523,7 +1519,7 @@ function zenAnswerMessageIds(
15231519
): ReadonlySet<MessageId> {
15241520
const replies: Array<{ readonly message: ThreadFeedMessage; readonly index: number }> = [];
15251521
const lastReplyByResponse = new Map<string, MessageId>();
1526-
const steerAnswers = new Set(answersBeforeSteers(feed));
1522+
const keptAnswers = new Set(finalAnswerIds(feed));
15271523
let userMessages = 0;
15281524
let awaitingReply = false;
15291525
let candidate: MessageId | null = null;
@@ -1538,7 +1534,7 @@ function zenAnswerMessageIds(
15381534
}
15391535
const reply =
15401536
entry.type === "message" && entry.message.role === "assistant" ? entry.message : null;
1541-
if (candidate !== null && reply !== null) steerAnswers.add(candidate);
1537+
if (candidate !== null && reply !== null) keptAnswers.add(candidate);
15421538
candidate = null;
15431539
if (answering && startsResponse(entry)) answeringFrom = index + 1;
15441540
if (entry.type === "message" && entry.message.role === "user") {
@@ -1558,7 +1554,7 @@ function zenAnswerMessageIds(
15581554
replies
15591555
.filter(
15601556
({ message, index }) =>
1561-
steerAnswers.has(message.id) ||
1557+
keptAnswers.has(message.id) ||
15621558
(terminal.has(message.id) &&
15631559
index < answeringFrom &&
15641560
(answeringRunId === null || message.runId !== answeringRunId)),

0 commit comments

Comments
 (0)