Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions src/browser/features/Messages/ChatBarrier/RetryBarrier.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,26 @@ describe("RetryBarrier", () => {
globalThis.document = undefined as unknown as Document;
});

test("uses delayed-start copy while the first response is still starting", () => {
currentWorkspaceState = createWorkspaceState({
isStreamStarting: true,
messages: [
{
type: "user",
id: "user-1",
historyId: "user-1",
content: "Hello",
historySequence: 1,
},
],
});

const view = render(<RetryBarrier workspaceId="ws-1" />);

expect(view.getByText("Response startup is taking longer than expected")).toBeTruthy();
expect(view.queryByText("Stream interrupted")).toBeNull();
});

test("shows error details when manual resume fails before stream events", async () => {
resumeStreamResult = {
success: false,
Expand Down
14 changes: 13 additions & 1 deletion src/browser/features/Messages/ChatBarrier/RetryBarrier.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,23 @@ export const RetryBarrier: React.FC<RetryBarrierProps> = (props) => {
const lastMessage = getLastNonDecorativeMessage(workspaceState.messages);
const lastStreamError = lastMessage?.type === "stream-error" ? lastMessage : null;
const interruptionReason = lastStreamError?.errorType === "rate_limit" ? "Rate limited" : null;
const isWaitingForInitialResponse =
lastMessage?.type === "user" && workspaceState.isStreamStarting;

let statusIcon: React.ReactNode = (
<AlertTriangle aria-hidden="true" className="text-warning h-4 w-4 shrink-0" />
);
let statusText: React.ReactNode = <>{interruptionReason ?? "Stream interrupted"}</>;
let statusText: React.ReactNode = (
<>
{interruptionReason ??
// A trailing user message means the backend has not emitted stream-start yet.
// Long init hooks (for example over SSH) can legitimately keep us here, so avoid
// claiming the stream was interrupted until we have evidence that it actually was.
(isWaitingForInitialResponse
? "Response startup is taking longer than expected"
: "Stream interrupted")}
</>
);
let actionButton: React.ReactNode = (
<button
className="bg-warning font-primary text-background cursor-pointer rounded border-none px-4 py-2 text-xs font-semibold whitespace-nowrap transition-all duration-200 hover:-translate-y-px hover:brightness-120 active:translate-y-0 disabled:cursor-not-allowed disabled:opacity-50"
Expand Down
Loading