Skip to content

Commit 4daa446

Browse files
fix(v2): clear limit warnings after provider recovery
1 parent d5452d9 commit 4daa446

5 files changed

Lines changed: 118 additions & 82 deletions

File tree

‎apps/mobile/src/features/threads/thread-work-log.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,8 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
890890
const isSystemNotice = row.projectedItem.item.type === "system_notice";
891891
const isUsageLimit =
892892
row.projectedItem.item.type === "error" &&
893-
row.projectedItem.item.failure.class === "usage_limit";
893+
row.projectedItem.item.failure.class === "usage_limit" &&
894+
row.projectedItem.item.status !== "completed";
894895
const iconIsDestructive =
895896
!isSystemNotice && !isUsageLimit && (row.icon === "alert" || row.icon === "warning");
896897
const failed = row.status === "failure";

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

Lines changed: 88 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -363,88 +363,97 @@ describe("buildThreadFeed", () => {
363363
expect(activity?.getFullDetail()).toContain(message);
364364
});
365365

366-
it("presents provider retries as visible work-log activity", () => {
367-
const retryBase = {
368-
...base("item-provider-retry", "2026-06-20T00:00:02.000Z", 1),
369-
type: "error" as const,
370-
failure: {
371-
class: "transport_error" as const,
372-
message: "The response stream disconnected.",
373-
code: "responseStreamDisconnected",
374-
retryable: true,
375-
},
376-
retry: {
377-
attempt: 2,
378-
maxAttempts: 5,
379-
retryDelayMs: null,
380-
},
381-
};
382-
const runningFeed = buildThreadFeed([
383-
projected(
384-
{
385-
...retryBase,
386-
status: "running",
387-
title: "Provider retry",
388-
completedAt: null,
389-
},
390-
0,
391-
),
392-
]);
393-
const recoveredFeed = buildThreadFeed([
394-
projected(
395-
{
396-
...retryBase,
397-
status: "completed",
398-
title: "Provider recovered",
366+
it.each(["transport_error", "usage_limit"] as const)(
367+
"presents %s retries and clears warning markers on recovery",
368+
(failureClass) => {
369+
const retryBase = {
370+
...base("item-provider-retry", "2026-06-20T00:00:02.000Z", 1),
371+
type: "error" as const,
372+
failure: {
373+
class: failureClass,
374+
message: "The response stream disconnected.",
375+
code: "responseStreamDisconnected",
376+
retryable: true,
399377
},
400-
0,
401-
),
402-
]);
403-
const failedFeed = buildThreadFeed([
404-
projected(
405-
{
406-
...retryBase,
407-
status: "failed",
408-
title: "Provider retry failed",
378+
retry: {
379+
attempt: 2,
380+
maxAttempts: 5,
381+
retryDelayMs: null,
409382
},
410-
0,
411-
),
412-
projected(command("2026-06-20T00:00:03.000Z"), 1),
413-
]);
414-
const runningActivity = runningFeed.find((entry) => entry.type === "activity-group")
415-
?.activities[0];
416-
const recoveredActivity = recoveredFeed.find((entry) => entry.type === "activity-group")
417-
?.activities[0];
418-
if (runningActivity === undefined || recoveredActivity === undefined) {
419-
throw new Error("Expected provider retry work-log activities.");
420-
}
383+
};
384+
const runningFeed = buildThreadFeed([
385+
projected(
386+
{
387+
...retryBase,
388+
status: "running",
389+
title: "Provider retry",
390+
completedAt: null,
391+
},
392+
0,
393+
),
394+
]);
395+
const recoveredFeed = buildThreadFeed([
396+
projected(
397+
{
398+
...retryBase,
399+
status: "completed",
400+
title: "Provider recovered",
401+
},
402+
0,
403+
),
404+
]);
405+
if (failureClass === "usage_limit") {
406+
const recoveredActivity = recoveredFeed.flatMap((entry) =>
407+
entry.type === "activity-group" ? entry.activities : [],
408+
)[0];
409+
expect(recoveredActivity).toMatchObject({ status: "success", icon: "check" });
410+
}
411+
const failedFeed = buildThreadFeed([
412+
projected(
413+
{
414+
...retryBase,
415+
status: "failed",
416+
title: "Provider retry failed",
417+
},
418+
0,
419+
),
420+
projected(command("2026-06-20T00:00:03.000Z"), 1),
421+
]);
422+
const runningActivity = runningFeed.find((entry) => entry.type === "activity-group")
423+
?.activities[0];
424+
const recoveredActivity = recoveredFeed.find((entry) => entry.type === "activity-group")
425+
?.activities[0];
426+
if (runningActivity === undefined || recoveredActivity === undefined) {
427+
throw new Error("Expected provider retry work-log activities.");
428+
}
421429

422-
expect(runningActivity).toMatchObject({
423-
summary: "Provider retry",
424-
status: "neutral",
425-
toolLike: false,
426-
});
427-
expect(threadFeedActivityIsVisible(runningActivity)).toBe(true);
428-
expect(recoveredActivity).toMatchObject({
429-
summary: "Provider recovered",
430-
status: "success",
431-
toolLike: false,
432-
});
433-
const failedPresentation = deriveThreadFeedPresentation(
434-
failedFeed,
435-
{ runId, status: "running", startedAt: null, completedAt: null },
436-
new Set(),
437-
);
438-
expect(failedPresentation.map((entry) => entry.type)).toEqual([
439-
"activity-group",
440-
"work-toggle",
441-
]);
442-
expect(
443-
failedPresentation[0]?.type === "activity-group"
444-
? failedPresentation[0].activities[0]?.summary
445-
: null,
446-
).toBe("Provider retry failed");
447-
});
430+
expect(runningActivity).toMatchObject({
431+
summary: "Provider retry",
432+
status: "neutral",
433+
toolLike: false,
434+
});
435+
expect(threadFeedActivityIsVisible(runningActivity)).toBe(true);
436+
expect(recoveredActivity).toMatchObject({
437+
summary: "Provider recovered",
438+
status: "success",
439+
toolLike: false,
440+
});
441+
const failedPresentation = deriveThreadFeedPresentation(
442+
failedFeed,
443+
{ runId, status: "running", startedAt: null, completedAt: null },
444+
new Set(),
445+
);
446+
expect(failedPresentation.map((entry) => entry.type)).toEqual([
447+
"activity-group",
448+
"work-toggle",
449+
]);
450+
expect(
451+
failedPresentation[0]?.type === "activity-group"
452+
? failedPresentation[0].activities[0]?.summary
453+
: null,
454+
).toBe("Provider retry failed");
455+
},
456+
);
448457

449458
it.each(["pending", "running", "completed"] as const)(
450459
"omits %s task progress without hiding adjacent conversation items",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,11 @@ function itemIcon(item: OrchestrationV2TurnItem): ThreadFeedActivity["icon"] {
433433
case "system_notice":
434434
return "warning";
435435
case "error":
436-
return item.failure.class === "usage_limit" ? "warning" : "alert";
436+
return item.failure.class === "usage_limit"
437+
? item.status === "completed"
438+
? "check"
439+
: "warning"
440+
: "alert";
437441
case "checkpoint":
438442
case "proposed_plan":
439443
case "todo_list":

‎apps/web/src/session-logic.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,28 @@ describe("V2 session presentation", () => {
106106
failure: { ...retryItem.failure, class: "usage_limit" },
107107
}),
108108
).toMatchObject({ label: "Usage limit reached after 2/10 retries" });
109+
const recoveredLimit = {
110+
...retryItem,
111+
status: "completed" as const,
112+
completedAt: now,
113+
failure: { ...retryItem.failure, class: "usage_limit" as const },
114+
};
115+
const [recoveredEntry] = deriveTimelineEntriesFromVisibleTurnItems({
116+
visibleTurnItems: [
117+
{
118+
item: recoveredLimit,
119+
position: 0,
120+
visibility: "local",
121+
sourceThreadId: recoveredLimit.threadId,
122+
sourceItemId: recoveredLimit.id,
123+
},
124+
],
125+
optimisticMessages: [],
126+
});
127+
if (recoveredEntry?.kind !== "work") throw new Error("Expected recovered provider work");
128+
expect(recoveredEntry.entry.label).toBe("Provider recovered (2/10 retries)");
129+
expect(recoveredEntry.entry.sourceActivityKind).not.toBe("runtime.warning");
130+
expect(workEntryDisplayIndicatesToolFailure(recoveredEntry.entry)).toBe(false);
109131
expect(providerErrorPresentation(retryItem)).toEqual({
110132
label: "Retrying provider (2/10)",
111133
detail: "Claude API overloaded. Retrying in 1.5s.",

‎apps/web/src/session-logic.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ function projectedWorkEntry(row: OrchestrationV2ProjectedTurnItem): WorkLogEntry
481481
return {
482482
...common,
483483
...presentation,
484-
...(item.failure.class === "usage_limit"
484+
...(item.failure.class === "usage_limit" && item.status !== "completed"
485485
? { sourceActivityKind: "runtime.warning" }
486486
: item.retry === undefined
487487
? { sourceActivityKind: "runtime.error" }

0 commit comments

Comments
 (0)