Skip to content

🤖 fix: add compact retry shortcut for stream errors #1752

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

Open
ammar-agent wants to merge 9 commits into
base: main
Choose a base branch
from
Open

🤖 fix: add compact retry shortcut for stream errors #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5db51b
🤖 fix: add compact retry action for stream errors
ammar-agent Jan 18, 2026
91bc781
🤖 tests: allow multiple compact retry buttons
ammar-agent Jan 18, 2026
760c19c
🤖 fix: move compact retry into stream error card
ammar-agent Jan 18, 2026
93893ad
🤖 fix: wire message list context in chat pane
ammar-agent Jan 18, 2026
b175779
🤖 fix: improve compaction CTA contrast
ammar-agent Jan 18, 2026
c8e86a5
🤖 fix: align compact retry CTA and hide duplicates
ammar-agent Jan 18, 2026
98b3aae
🤖 fix: resume compaction retries without synthetic
ammar-agent Jan 18, 2026
8806783
fix: show compact retry command
ammar-agent Jan 19, 2026
b4730ad
fix: simplify compaction retry flow
ammar-agent Jan 19, 2026
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
161 changes: 89 additions & 72 deletions src/browser/components/ChatPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import React, {
useDeferredValue,
useMemo,
} from "react";
import { MessageListProvider } from "./Messages/MessageListContext";
import { cn } from "@/common/lib/utils";
import { MessageRenderer } from "./Messages/MessageRenderer";
import { InterruptedBarrier } from "./Messages/ChatBarrier/InterruptedBarrier";
Expand Down Expand Up @@ -170,6 +171,15 @@ export const ChatPane: React.FC<ChatPaneProps> = (props) => {
? transformedMessages
: deferredTransformedMessages;

const latestMessageId =
deferredMessages.length > 0
? (deferredMessages[deferredMessages.length - 1]?.id ?? null)
: null;
const messageListContextValue = useMemo(
() => ({ workspaceId, latestMessageId }),
[workspaceId, latestMessageId]
);

const autoCompactionResult = useMemo(
() => checkAutoCompaction(workspaceUsage, pendingModel, use1M, autoCompactionThreshold / 100),
[workspaceUsage, pendingModel, use1M, autoCompactionThreshold]
Expand Down Expand Up @@ -448,6 +458,11 @@ export const ChatPane: React.FC<ChatPaneProps> = (props) => {
)
: false;

const lastMessage = workspaceState.messages[workspaceState.messages.length - 1];
const suppressRetryBarrier =
lastMessage?.type === "stream-error" && lastMessage.errorType === "context_exceeded";
const showRetryBarrierUI = showRetryBarrier && !suppressRetryBarrier;

// Handle keyboard shortcuts (using optional refs that are safe even if not initialized)
useAIViewKeybinds({
workspaceId,
Expand Down Expand Up @@ -557,79 +572,81 @@ export const ChatPane: React.FC<ChatPaneProps> = (props) => {
</p>
</div>
) : (
<>
{deferredMessages.map((msg, index) => {
// Compute bash_output grouping at render-time
const bashOutputGroup = computeBashOutputGroupInfo(deferredMessages, index);

// For bash_output groups, use first message ID as expansion key
const groupKey = bashOutputGroup
? deferredMessages[bashOutputGroup.firstIndex]?.id
: undefined;
const isGroupExpanded = groupKey ? expandedBashGroups.has(groupKey) : false;

// Skip rendering middle items in a bash_output group (unless expanded)
if (bashOutputGroup?.position === "middle" && !isGroupExpanded) {
return null;
}

const isAtCutoff =
editCutoffHistoryId !== undefined &&
msg.type !== "history-hidden" &&
msg.type !== "workspace-init" &&
msg.historyId === editCutoffHistoryId;

return (
<React.Fragment key={msg.id}>
<div
data-testid="chat-message"
data-message-id={
msg.type !== "history-hidden" && msg.type !== "workspace-init"
? msg.historyId
: undefined
}
>
<MessageRenderer
message={msg}
onEditUserMessage={handleEditUserMessage}
workspaceId={workspaceId}
isCompacting={isCompacting}
onReviewNote={handleReviewNote}
isLatestProposePlan={
msg.type === "tool" &&
msg.toolName === "propose_plan" &&
msg.id === latestProposePlanId
<MessageListProvider value={messageListContextValue}>
<>
{deferredMessages.map((msg, index) => {
// Compute bash_output grouping at render-time
const bashOutputGroup = computeBashOutputGroupInfo(deferredMessages, index);

// For bash_output groups, use first message ID as expansion key
const groupKey = bashOutputGroup
? deferredMessages[bashOutputGroup.firstIndex]?.id
: undefined;
const isGroupExpanded = groupKey ? expandedBashGroups.has(groupKey) : false;

// Skip rendering middle items in a bash_output group (unless expanded)
if (bashOutputGroup?.position === "middle" && !isGroupExpanded) {
return null;
}

const isAtCutoff =
editCutoffHistoryId !== undefined &&
msg.type !== "history-hidden" &&
msg.type !== "workspace-init" &&
msg.historyId === editCutoffHistoryId;

return (
<React.Fragment key={msg.id}>
<div
data-testid="chat-message"
data-message-id={
msg.type !== "history-hidden" && msg.type !== "workspace-init"
? msg.historyId
: undefined
}
bashOutputGroup={bashOutputGroup}
/>
</div>
{/* Show collapsed indicator after the first item in a bash_output group */}
{bashOutputGroup?.position === "first" && groupKey && (
<BashOutputCollapsedIndicator
processId={bashOutputGroup.processId}
collapsedCount={bashOutputGroup.collapsedCount}
isExpanded={isGroupExpanded}
onToggle={() => {
setExpandedBashGroups((prev) => {
const next = new Set(prev);
if (next.has(groupKey)) {
next.delete(groupKey);
} else {
next.add(groupKey);
}
return next;
});
}}
/>
)}
{isAtCutoff && <EditCutoffBarrier />}
{shouldShowInterruptedBarrier(msg) && <InterruptedBarrier />}
</React.Fragment>
);
})}
{/* Show RetryBarrier after the last message if needed */}
{showRetryBarrier && <RetryBarrier workspaceId={workspaceId} />}
</>
>
<MessageRenderer
message={msg}
onEditUserMessage={handleEditUserMessage}
workspaceId={workspaceId}
isCompacting={isCompacting}
onReviewNote={handleReviewNote}
isLatestProposePlan={
msg.type === "tool" &&
msg.toolName === "propose_plan" &&
msg.id === latestProposePlanId
}
bashOutputGroup={bashOutputGroup}
/>
</div>
{/* Show collapsed indicator after the first item in a bash_output group */}
{bashOutputGroup?.position === "first" && groupKey && (
<BashOutputCollapsedIndicator
processId={bashOutputGroup.processId}
collapsedCount={bashOutputGroup.collapsedCount}
isExpanded={isGroupExpanded}
onToggle={() => {
setExpandedBashGroups((prev) => {
const next = new Set(prev);
if (next.has(groupKey)) {
next.delete(groupKey);
} else {
next.add(groupKey);
}
return next;
});
}}
/>
)}
{isAtCutoff && <EditCutoffBarrier />}
{shouldShowInterruptedBarrier(msg) && <InterruptedBarrier />}
</React.Fragment>
);
})}
{/* Show RetryBarrier after the last message if needed */}
{showRetryBarrierUI && <RetryBarrier workspaceId={workspaceId} />}
</>
</MessageListProvider>
)}
<PinnedTodoList workspaceId={workspaceId} />
<StreamingBarrier workspaceId={workspaceId} />
Expand Down
Loading
Loading